119 files changed, 21865 insertions, 16895 deletions

diff --git a/fontconfig/src/fcdir.c b/fontconfig/src/fcdir.c
index d8b094fbc..4399afc4a 100644
--- a/fontconfig/src/fcdir.c
+++ b/fontconfig/src/fcdir.c
@@ -211,6 +211,9 @@ bail2:
 bail1:
     closedir (d);
 bail:
+    if (file)
+	free (file);
+
     return ret;
 }
 
diff --git a/libxcb/src/Makefile.am b/libxcb/src/Makefile.am
index 950de5c14..fed691447 100644
--- a/libxcb/src/Makefile.am
+++ b/libxcb/src/Makefile.am
@@ -225,8 +225,14 @@ endif
 nodist_xcbinclude_HEADERS = $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-BUILT_SOURCES = $(EXTSOURCES)
-CLEANFILES = $(EXTSOURCES) $(EXTHEADERS)
+STATIC_MANS = man/xcb-examples.3 man/xcb-requests.3
+BUILT_MANS = man/xcb_*.3
+man_MANS = = $(STATIC_MANS) $(BUILT_MANS)
+
+BUILT_SOURCES = $(EXTSOURCES) $(BUILT_MANS)
+CLEANFILES = $(EXTSOURCES) $(EXTHEADERS) $(BUILT_MANS)
 
 $(EXTSOURCES): c_client.py
 	$(PYTHON) $(srcdir)/c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml)
+
+$(man_MANS): $(EXTSOURCES)
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py
index ad3ea22ea..d006d305d 100644
--- a/libxcb/src/c_client.py
+++ b/libxcb/src/c_client.py
@@ -3,7 +3,9 @@ from xml.etree.cElementTree import *
 from os.path import basename
 from functools import reduce
 import getopt
+import os
 import sys
+import time
 import re
 
 # Jump to the bottom of this file for the main routine
@@ -31,6 +33,11 @@ finished_serializers = []
 finished_sizeof = []
 finished_switch = []
 
+# keeps enum objects so that we can refer to them when generating manpages.
+enums = {}
+
+manpaths = False
+
 def _h(fmt, *args):
     '''
     Writes the given line to the header file.
@@ -247,6 +254,8 @@ def c_enum(self, name):
     Exported function that handles enum declarations.
     '''
 
+    enums[name] = self
+
     tname = _t(name)
     if namecount[tname] > 1:
         tname = _t(name + ('enum',))
@@ -261,7 +270,10 @@ def c_enum(self, name):
         count = count - 1
         equals = ' = ' if eval != '' else ''
         comma = ',' if count > 0 else ''
-        _h('    %s%s%s%s', _n(name + (enam,)).upper(), equals, eval, comma)
+        doc = ''
+        if hasattr(self, "doc") and self.doc and enam in self.doc.fields:
+            doc = '\n/**< %s */\n' % self.doc.fields[enam]
+        _h('    %s%s%s%s%s', _n(name + (enam,)).upper(), equals, eval, comma, doc)
 
     _h('} %s;', tname)
 
@@ -1878,11 +1890,58 @@ def _c_request_helper(self, name, cookie_type, void, regular, aux=False):
     _c_setlevel(1)
     _h('')
     _h('/**')
-    _h(' * Delivers a request to the X server')
+    if hasattr(self, "doc") and self.doc:
+        if self.doc.brief:
+            _h(' * @brief ' + self.doc.brief)
+        else:
+            _h(' * No brief doc yet')
+
+    _h(' *')
     _h(' * @param c The connection')
+    param_names = [f.c_field_name for f in param_fields]
+    if hasattr(self, "doc") and self.doc:
+        for field in param_fields:
+            # XXX: hard-coded until we fix xproto.xml
+            base_func_name = self.c_request_name if not aux else self.c_aux_name
+            if base_func_name == 'xcb_change_gc' and field.c_field_name == 'value_mask':
+                field.enum = 'GC'
+            elif base_func_name == 'xcb_change_window_attributes' and field.c_field_name == 'value_mask':
+                field.enum = 'CW'
+            elif base_func_name == 'xcb_create_window' and field.c_field_name == 'value_mask':
+                field.enum = 'CW'
+            if field.enum:
+                # XXX: why the 'xcb' prefix?
+                key = ('xcb', field.enum)
+
+                tname = _t(key)
+                if namecount[tname] > 1:
+                    tname = _t(key + ('enum',))
+                _h(' * @param %s A bitmask of #%s values.' % (field.c_field_name, tname))
+
+            if self.doc and field.field_name in self.doc.fields:
+                desc = self.doc.fields[field.field_name]
+                for name in param_names:
+                    desc = desc.replace('`%s`' % name, '\\a %s' % (name))
+                desc = desc.split("\n")
+                desc = [line if line != '' else '\\n' for line in desc]
+                _h(' * @param %s %s' % (field.c_field_name, "\n * ".join(desc)))
+            # If there is no documentation yet, we simply don't generate an
+            # @param tag. Doxygen will then warn about missing documentation.
+
     _h(' * @return A cookie')
     _h(' *')
-    _h(' * Delivers a request to the X server.')
+
+    if hasattr(self, "doc") and self.doc:
+        if self.doc.description:
+            desc = self.doc.description
+            for name in param_names:
+                desc = desc.replace('`%s`' % name, '\\a %s' % (name))
+            desc = desc.split("\n")
+            _h(' * ' + "\n * ".join(desc))
+        else:
+            _h(' * No description yet')
+    else:
+        _h(' * Delivers a request to the X server.')
     _h(' * ')
     if checked:
         _h(' * This form can be used only if the request will not cause')
@@ -2201,6 +2260,523 @@ def _c_cookie(self, name):
     _h('    unsigned int sequence; /**<  */')
     _h('} %s;', self.c_cookie_type)
 
+def _man_request(self, name, cookie_type, 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
+
+    def create_link(linkname):
+        name = 'man/%s.3' % linkname
+        if manpaths:
+            sys.stdout.write(name)
+        f = open(name, 'w')
+        f.write('.so man3/%s.3' % func_name)
+        f.close()
+
+    if manpaths:
+        sys.stdout.write('man/%s.3 ' % func_name)
+    # Our CWD is src/, so this will end up in src/man/
+    f = open('man/%s.3' % func_name, 'w')
+    f.write('.TH %s 3  %s "XCB" "XCB Requests"\n' % (func_name, today))
+    # Left-adjust instead of adjusting to both sides
+    f.write('.ad l\n')
+    f.write('.SH NAME\n')
+    brief = self.doc.brief if hasattr(self, "doc") and self.doc else ''
+    f.write('%s \\- %s\n' % (func_name, brief))
+    f.write('.SH SYNOPSIS\n')
+    # Don't split words (hyphenate)
+    f.write('.hy 0\n')
+    f.write('.B #include <xcb/%s.h>\n' % _ns.header)
+
+    # function prototypes
+    prototype = ''
+    count = len(param_fields)
+    for field in param_fields:
+        count = count - 1
+        c_field_const_type = field.c_field_const_type
+        c_pointer = field.c_pointer
+        if c_pointer == ' ':
+            c_pointer = ''
+        if field.type.need_serialize and not aux:
+            c_field_const_type = "const void"
+            c_pointer = '*'
+        comma = ', ' if count else ');'
+        prototype += '%s\\ %s\\fI%s\\fP%s' % (c_field_const_type, c_pointer, field.c_field_name, comma)
+
+    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))
+    create_link('%s_%s' % (base_func_name, ('checked' if void else 'unchecked')))
+    if not void:
+        f.write('.PP\n')
+        f.write('.SS Reply datastructure\n')
+        f.write('.nf\n')
+        f.write('.sp\n')
+        f.write('typedef %s %s {\n' % (self.reply.c_container, self.reply.c_type))
+        struct_fields = []
+        maxtypelen = 0
+
+        for field in self.reply.fields:
+            if not field.type.fixed_size() and not self.is_switch and not self.is_union:
+                continue
+            if field.wire:
+                struct_fields.append(field)
+
+        for field in struct_fields:
+            length = len(field.c_field_type)
+            # account for '*' pointer_spec
+            if not field.type.fixed_size():
+                length += 1
+            maxtypelen = max(maxtypelen, length)
+
+        def _c_complex_field(self, field, space=''):
+            if (field.type.fixed_size() or
+                # in case of switch with switch children, don't make the field a pointer
+                # necessary for unserialize to work
+                (self.is_switch and field.type.is_switch)):
+                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:
+                spacing = ' ' * (maxtypelen - (len(field.c_field_type) + 1))
+                f.write('ELSE %s = %s\n' % (field.c_field_type, field.c_field_name))
+                #_h('%s    %s%s *%s%s; /**<  */', space, field.c_field_type, spacing, field.c_field_name, field.c_subscript)
+
+        if not self.is_switch:
+            for field in struct_fields:
+                _c_complex_field(self, field)
+        else:
+            for b in self.bitcases:
+                space = ''
+                if b.type.has_name:
+                    space = '    '
+                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
+
+        f.write('} \\fB%s\\fP;\n' % self.reply.c_type)
+        f.write('.fi\n')
+
+        f.write('.SS Reply function\n')
+        f.write('.HP\n')
+        f.write(('%s *\\fB%s\\fP(xcb_connection_t\\ *\\fIconn\\fP, %s\\ '
+                 '\\fIcookie\\fP, xcb_generic_error_t\\ **\\fIe\\fP);\n') %
+                (self.c_reply_type, self.c_reply_name, self.c_cookie_type))
+        create_link('%s' % self.c_reply_name)
+
+        has_accessors = False
+        for field in self.reply.fields:
+            if field.type.is_list and not field.type.fixed_size():
+                has_accessors = True
+            elif field.prev_varsized_field is not None or not field.type.fixed_size():
+                has_accessors = True
+
+        if has_accessors:
+            f.write('.SS Reply accessors\n')
+
+        def _c_accessors_field(self, field):
+            '''
+            Declares the accessor functions for a non-list field that follows a variable-length field.
+            '''
+            c_type = self.c_type
+
+            # special case: switch
+            switch_obj = self if self.is_switch else None
+            if self.is_bitcase:
+                switch_obj = self.parents[-1]
+            if switch_obj is not None:
+                c_type = switch_obj.c_type
+
+            if field.type.is_simple:
+                f.write('%s %s (const %s *reply)\n' % (field.c_field_type, field.c_accessor_name, c_type))
+                create_link('%s' % field.c_accessor_name)
+            else:
+                f.write('%s *%s (const %s *reply)\n' % (field.c_field_type, field.c_accessor_name, c_type))
+                create_link('%s' % field.c_accessor_name)
+
+        def _c_accessors_list(self, field):
+            '''
+            Declares the accessor functions for a list field.
+            Declares a direct-accessor function only if the list members are fixed size.
+            Declares length and get-iterator functions always.
+            '''
+            list = field.type
+            c_type = self.reply.c_type
+
+            # special case: switch
+            # in case of switch, 2 params have to be supplied to certain accessor functions:
+            #   1. the anchestor object (request or reply)
+            #   2. the (anchestor) switch object
+            # the reason is that switch is either a child of a request/reply or nested in another switch,
+            # so whenever we need to access a length field, we might need to refer to some anchestor type
+            switch_obj = self if self.is_switch else None
+            if self.is_bitcase:
+                switch_obj = self.parents[-1]
+            if switch_obj is not None:
+                c_type = switch_obj.c_type
+
+            params = []
+            fields = {}
+            parents = self.parents if hasattr(self, 'parents') else [self]
+            # '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
+                # the switch expr, and store the parent objects in accessor_params and
+                # the fields in switch_fields
+
+                # 'S': name for the 'toplevel' switch
+                toplevel_switch = parents[1]
+                params.append(('const %s *S' % toplevel_switch.c_type, toplevel_switch))
+                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)]
+
+                # look for fields in the remaining containers
+                for p in parents[2:] + [self]:
+                    # the separator between parent and child is always '.' here,
+                    # because of nested switch statements
+                    if not p.is_bitcase or (p.is_bitcase and p.has_name):
+                        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')
+                f.write('%s *\\fB%s\\fP(%s);\n' %
+                        (field.c_field_type, field.c_accessor_name, params[idx][0]))
+                create_link('%s' % field.c_accessor_name)
+
+            f.write('.HP\n')
+            f.write('int \\fB%s\\fP(const %s *\\fIreply\\fP);\n' %
+                    (field.c_length_name, c_type))
+            create_link('%s' % field.c_length_name)
+
+            if field.type.member.is_simple:
+                f.write('.HP\n')
+                f.write('xcb_generic_iterator_t \\fB%s\\fP(const %s *\\fIreply\\fP);\n' %
+                        (field.c_end_name, c_type))
+                create_link('%s' % field.c_end_name)
+            else:
+                f.write('.HP\n')
+                f.write('%s \\fB%s\\fP(const %s *\\fIreply\\fP);\n' %
+                        (field.c_iterator_type, field.c_iterator_name,
+                         c_type))
+                create_link('%s' % field.c_iterator_name)
+
+        for field in self.reply.fields:
+            if field.type.is_list and not field.type.fixed_size():
+                _c_accessors_list(self, field)
+            elif field.prev_varsized_field is not None or not field.type.fixed_size():
+                _c_accessors_field(self, field)
+
+
+    f.write('.br\n')
+    # Re-enable hyphenation and adjusting to both sides
+    f.write('.hy 1\n')
+
+    # argument reference
+    f.write('.SH REQUEST ARGUMENTS\n')
+    f.write('.IP \\fI%s\\fP 1i\n' % 'conn')
+    f.write('The XCB connection to X11.\n')
+    for field in param_fields:
+        f.write('.IP \\fI%s\\fP 1i\n' % (field.c_field_name))
+        printed_enum = False
+        # XXX: hard-coded until we fix xproto.xml
+        if base_func_name == 'xcb_change_gc' and field.c_field_name == 'value_mask':
+            field.enum = 'GC'
+        elif base_func_name == 'xcb_change_window_attributes' and field.c_field_name == 'value_mask':
+            field.enum = 'CW'
+        elif base_func_name == 'xcb_create_window' and field.c_field_name == 'value_mask':
+            field.enum = 'CW'
+        if hasattr(field, "enum") and field.enum:
+            # XXX: why the 'xcb' prefix?
+            key = ('xcb', field.enum)
+            if key in enums:
+                f.write('One of the following values:\n')
+                f.write('.RS 1i\n')
+                enum = enums[key]
+                count = len(enum.values)
+                for (enam, eval) in enum.values:
+                    count = count - 1
+                    f.write('.IP \\fI%s\\fP 1i\n' % (_n(key + (enam,)).upper()))
+                    if hasattr(enum, "doc") and enum.doc and enam in enum.doc.fields:
+                        desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', enum.doc.fields[enam])
+                        f.write('%s\n' % desc)
+                    else:
+                        f.write('TODO: NOT YET DOCUMENTED.\n')
+                f.write('.RE\n')
+                f.write('.RS 1i\n')
+                printed_enum = True
+
+        if hasattr(self, "doc") and self.doc and field.field_name in self.doc.fields:
+            desc = self.doc.fields[field.field_name]
+            desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', desc)
+            if printed_enum:
+                f.write('\n')
+            f.write('%s\n' % desc)
+        else:
+            f.write('TODO: NOT YET DOCUMENTED.\n')
+        if printed_enum:
+            f.write('.RE\n')
+
+    # Reply reference
+    if not void:
+        f.write('.SH REPLY FIELDS\n')
+        # These fields are present in every reply:
+        f.write('.IP \\fI%s\\fP 1i\n' % 'response_type')
+        f.write(('The type of this reply, in this case \\fI%s\\fP. This field '
+                 'is also present in the \\fIxcb_generic_reply_t\\fP and can '
+                 'be used to tell replies apart from each other.\n') %
+                 _n(self.reply.name).upper())
+        f.write('.IP \\fI%s\\fP 1i\n' % 'sequence')
+        f.write('The sequence number of the last request processed by the X11 server.\n')
+        f.write('.IP \\fI%s\\fP 1i\n' % 'length')
+        f.write('The length of the reply, in words (a word is 4 bytes).\n')
+        for field in self.reply.fields:
+            if (field.c_field_name in frozenset(['response_type', 'sequence', 'length']) or
+                field.c_field_name.startswith('pad')):
+                continue
+
+            if field.type.is_list and not field.type.fixed_size():
+                continue
+            elif field.prev_varsized_field is not None or not field.type.fixed_size():
+                continue
+            f.write('.IP \\fI%s\\fP 1i\n' % (field.c_field_name))
+            printed_enum = False
+            if hasattr(field, "enum") and field.enum:
+                # XXX: why the 'xcb' prefix?
+                key = ('xcb', field.enum)
+                if key in enums:
+                    f.write('One of the following values:\n')
+                    f.write('.RS 1i\n')
+                    enum = enums[key]
+                    count = len(enum.values)
+                    for (enam, eval) in enum.values:
+                        count = count - 1
+                        f.write('.IP \\fI%s\\fP 1i\n' % (_n(key + (enam,)).upper()))
+                        if enum.doc and enam in enum.doc.fields:
+                            desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', enum.doc.fields[enam])
+                            f.write('%s\n' % desc)
+                        else:
+                            f.write('TODO: NOT YET DOCUMENTED.\n')
+                    f.write('.RE\n')
+                    f.write('.RS 1i\n')
+                    printed_enum = True
+
+            if hasattr(self.reply, "doc") and self.reply.doc and field.field_name in self.reply.doc.fields:
+                desc = self.reply.doc.fields[field.field_name]
+                desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', desc)
+                if printed_enum:
+                    f.write('\n')
+                f.write('%s\n' % desc)
+            else:
+                f.write('TODO: NOT YET DOCUMENTED.\n')
+            if printed_enum:
+                f.write('.RE\n')
+
+
+
+    # text description
+    f.write('.SH DESCRIPTION\n')
+    if hasattr(self, "doc") and self.doc and self.doc.description:
+        desc = self.doc.description
+        desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', desc)
+        lines = desc.split('\n')
+        f.write('\n'.join(lines) + '\n')
+
+    f.write('.SH RETURN VALUE\n')
+    if void:
+        f.write(('Returns an \\fIxcb_void_cookie_t\\fP. Errors (if any) '
+                 'have to be handled in the event loop.\n\nIf you want to '
+                 'handle errors directly with \\fIxcb_request_check\\fP '
+                 'instead, use \\fI%s_checked\\fP. See '
+                 '\\fBxcb-requests(3)\\fP for details.\n') % (base_func_name))
+    else:
+        f.write(('Returns an \\fI%s\\fP. Errors have to be handled when '
+                 'calling the reply function \\fI%s\\fP.\n\nIf you want to '
+                 'handle errors in the event loop instead, use '
+                 '\\fI%s_unchecked\\fP. See \\fBxcb-requests(3)\\fP for '
+                 'details.\n') %
+                (cookie_type, self.c_reply_name, base_func_name))
+    f.write('.SH ERRORS\n')
+    if hasattr(self, "doc") and self.doc:
+        for errtype, errtext in self.doc.errors.iteritems():
+            f.write('.IP \\fI%s\\fP 1i\n' % (_t(('xcb', errtype, 'error'))))
+            errtext = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', errtext)
+            f.write('%s\n' % (errtext))
+    if not hasattr(self, "doc") or not self.doc or len(self.doc.errors) == 0:
+        f.write('This request does never generate any errors.\n')
+    if hasattr(self, "doc") and self.doc and self.doc.example:
+        f.write('.SH EXAMPLE\n')
+        f.write('.nf\n')
+        f.write('.sp\n')
+        lines = self.doc.example.split('\n')
+        f.write('\n'.join(lines) + '\n')
+        f.write('.fi\n')
+    f.write('.SH SEE ALSO\n')
+    if hasattr(self, "doc") and self.doc:
+        see = ['.BR %s (3)' % 'xcb-requests']
+        if self.doc.example:
+            see.append('.BR %s (3)' % 'xcb-examples')
+        for seename, seetype in self.doc.see.iteritems():
+            if seetype == 'program':
+                see.append('.BR %s (1)' % seename)
+            elif seetype == 'event':
+                see.append('.BR %s (3)' % _t(('xcb', seename, 'event')))
+            elif seetype == 'request':
+                see.append('.BR %s (3)' % _n(('xcb', seename)))
+            elif seetype == 'function':
+                see.append('.BR %s (3)' % seename)
+            else:
+                see.append('TODO: %s (type %s)' % (seename, seetype))
+        f.write(',\n'.join(see) + '\n')
+    f.write('.SH AUTHOR\n')
+    f.write('Generated from %s.xml. Contact xcb@lists.freedesktop.org for corrections and improvements.\n' % _ns.header)
+    f.close()
+
+def _man_event(self, name):
+    if manpaths:
+        sys.stdout.write('man/%s.3 ' % self.c_type)
+    # Our CWD is src/, so this will end up in src/man/
+    f = open('man/%s.3' % self.c_type, 'w')
+    f.write('.TH %s 3  %s "XCB" "XCB Events"\n' % (self.c_type, today))
+    # Left-adjust instead of adjusting to both sides
+    f.write('.ad l\n')
+    f.write('.SH NAME\n')
+    brief = self.doc.brief if hasattr(self, "doc") and self.doc else ''
+    f.write('%s \\- %s\n' % (self.c_type, brief))
+    f.write('.SH SYNOPSIS\n')
+    # Don't split words (hyphenate)
+    f.write('.hy 0\n')
+    f.write('.B #include <xcb/%s.h>\n' % _ns.header)
+
+    f.write('.PP\n')
+    f.write('.SS Event datastructure\n')
+    f.write('.nf\n')
+    f.write('.sp\n')
+    f.write('typedef %s %s {\n' % (self.c_container, self.c_type))
+    struct_fields = []
+    maxtypelen = 0
+
+    for field in self.fields:
+        if not field.type.fixed_size() and not self.is_switch and not self.is_union:
+            continue
+        if field.wire:
+            struct_fields.append(field)
+
+    for field in struct_fields:
+        length = len(field.c_field_type)
+        # account for '*' pointer_spec
+        if not field.type.fixed_size():
+            length += 1
+        maxtypelen = max(maxtypelen, length)
+
+    def _c_complex_field(self, field, space=''):
+        if (field.type.fixed_size() or
+            # in case of switch with switch children, don't make the field a pointer
+            # necessary for unserialize to work
+            (self.is_switch and field.type.is_switch)):
+            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'
+
+    if not self.is_switch:
+        for field in struct_fields:
+            _c_complex_field(self, field)
+    else:
+        for b in self.bitcases:
+            space = ''
+            if b.type.has_name:
+                space = '    '
+            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
+
+    f.write('} \\fB%s\\fP;\n' % self.c_type)
+    f.write('.fi\n')
+
+
+    f.write('.br\n')
+    # Re-enable hyphenation and adjusting to both sides
+    f.write('.hy 1\n')
+
+    # argument reference
+    f.write('.SH EVENT FIELDS\n')
+    f.write('.IP \\fI%s\\fP 1i\n' % 'response_type')
+    f.write(('The type of this event, in this case \\fI%s\\fP. This field is '
+             'also present in the \\fIxcb_generic_event_t\\fP and can be used '
+             'to tell events apart from each other.\n') % _n(name).upper())
+    f.write('.IP \\fI%s\\fP 1i\n' % 'sequence')
+    f.write('The sequence number of the last request processed by the X11 server.\n')
+
+    if not self.is_switch:
+        for field in struct_fields:
+            # Skip the fields which every event has, we already documented
+            # them (see above).
+            if field.c_field_name in ('response_type', 'sequence'):
+                continue
+            if isinstance(field.type, PadType):
+                continue
+            f.write('.IP \\fI%s\\fP 1i\n' % (field.c_field_name))
+            if hasattr(self, "doc") and self.doc and field.field_name in self.doc.fields:
+                desc = self.doc.fields[field.field_name]
+                desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', desc)
+                f.write('%s\n' % desc)
+            else:
+                f.write('NOT YET DOCUMENTED.\n')
+
+    # text description
+    f.write('.SH DESCRIPTION\n')
+    if hasattr(self, "doc") and self.doc and self.doc.description:
+        desc = self.doc.description
+        desc = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', desc)
+        lines = desc.split('\n')
+        f.write('\n'.join(lines) + '\n')
+
+    if hasattr(self, "doc") and self.doc and self.doc.example:
+        f.write('.SH EXAMPLE\n')
+        f.write('.nf\n')
+        f.write('.sp\n')
+        lines = self.doc.example.split('\n')
+        f.write('\n'.join(lines) + '\n')
+        f.write('.fi\n')
+    f.write('.SH SEE ALSO\n')
+    if hasattr(self, "doc") and self.doc:
+        see = ['.BR %s (3)' % 'xcb_generic_event_t']
+        if self.doc.example:
+            see.append('.BR %s (3)' % 'xcb-examples')
+        for seename, seetype in self.doc.see.iteritems():
+            if seetype == 'program':
+                see.append('.BR %s (1)' % seename)
+            elif seetype == 'event':
+                see.append('.BR %s (3)' % _t(('xcb', seename, 'event')))
+            elif seetype == 'request':
+                see.append('.BR %s (3)' % _n(('xcb', seename)))
+            elif seetype == 'function':
+                see.append('.BR %s (3)' % seename)
+            else:
+                see.append('TODO: %s (type %s)' % (seename, seetype))
+        f.write(',\n'.join(see) + '\n')
+    f.write('.SH AUTHOR\n')
+    f.write('Generated from %s.xml. Contact xcb@lists.freedesktop.org for corrections and improvements.\n' % _ns.header)
+    f.close()
+
+
 def c_request(self, name):
     '''
     Exported function that handles request declarations.
@@ -2238,6 +2814,10 @@ def c_request(self, name):
             _c_request_helper(self, name, 'xcb_void_cookie_t', True, False, True)
             _c_request_helper(self, name, 'xcb_void_cookie_t', True, True, True)
 
+    # 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)
 
 def c_event(self, name):
     '''
@@ -2256,6 +2836,8 @@ def c_event(self, name):
         _h('')
         _h('typedef %s %s;', _t(self.name + ('event',)), _t(name + ('event',)))
 
+    _man_event(self, name)
+
 def c_error(self, name):
     '''
     Exported function that handles error declarations.
@@ -2292,7 +2874,7 @@ output = {'open'    : c_open,
 
 # Check for the argument that specifies path to the xcbgen python package.
 try:
-    opts, args = getopt.getopt(sys.argv[1:], 'p:')
+    opts, args = getopt.getopt(sys.argv[1:], 'p:m')
 except getopt.GetoptError as err:
     print(err)
     print('Usage: c_client.py [-p path] file.xml')
@@ -2301,10 +2883,14 @@ except getopt.GetoptError as err:
 for (opt, arg) in opts:
     if opt == '-p':
         sys.path.insert(1, arg)
+    elif opt == '-m':
+        manpaths = True
+        sys.stdout.write('man_MANS = ')
 
 # Import the module class
 try:
     from xcbgen.state import Module
+    from xcbgen.xtypes import *
 except ImportError:
     print('''
 Failed to load the xcbgen Python package!
@@ -2315,6 +2901,12 @@ Refer to the README file in xcb/proto for more info.
 ''')
     raise
 
+# Ensure the man subdirectory exists
+if not os.path.exists('man'):
+    os.mkdir('man')
+
+today = time.strftime('%Y-%m-%d', time.gmtime(os.path.getmtime(args[0])))
+
 # Parse the xml header
 module = Module(args[0], output)
 
diff --git a/libxcb/src/man/xcb-examples.3 b/libxcb/src/man/xcb-examples.3
new file mode 100644
index 000000000..291af37d0
--- /dev/null
+++ b/libxcb/src/man/xcb-examples.3
@@ -0,0 +1,59 @@
+.TH xcb-examples 3 2011-12-11 "XCB" "XCB examples"
+.ad l
+.SH NAME
+xcb-examples \- manpage examples
+.SH DESCRIPTION
+Many of the XCB manpages contain example code. These examples intend to explain
+how to use one particular part of XCB. They almost never represent a standalone
+(or even useful) program - X11 programs are relatively involved and
+thus beyond the scope of a manpage example.
+
+.SH ENVIRONMENT
+
+Every example assumes you have an \fIxcb_connection\fP and possibly other
+variables at hand. For illustrating how \fIxcb_get_property\fP works, you need
+the window of which you want to get the property, for example. To make it clear
+that these variables are your responsibility, these examples consist of a
+single function which takes the necessary variables as parameters.
+
+.SH FLUSHING
+
+Flushing means calling \fIxcb_flush\fP to clear the XCB-internal write buffer
+and send all pending requests to the X11 server. You don't explicitly need to
+flush before using a reply function (like \fIxcb_query_pointer_reply\fP), but
+you do need to flush before entering the event loop of your program.
+
+There are only two cases when XCB flushes by itself. The first case is when
+its write buffer becomes full, the second case is when you are asking for
+the reply of a request which wasn't flushed out yet (like
+\fIxcb_query_pointer_reply\fP). This last point also includes
+xcb_request_check(). Please note that waiting for an event does \fBNOT\fP
+flush.
+
+Examples generally include the \fIxcb_flush\fP call where appropriate (for
+example after setting a property). Therefore, including these functions and
+calling them in your application should just work. However, you might get
+better results when flushing outside of the function, depending on the
+architecture of your program.
+
+.SH COMPILATION
+
+If an example does not compile (without warnings) when using \fI-std=c99\fP,
+that is considered a documentation bug. Similarly, not handling errors or
+leaking memory is also considered a documentation bug. Please inform us about
+it on xcb@lists.freedesktop.org.
+
+.SH CODING STYLE
+
+Every example uses 4 spaces for indention.
+
+Comments are in asterisks, like /* this */.
+
+No line is longer than 80 characters (including indention).
+
+.SH SEE ALSO
+.BR xcb_connect (3),
+.BR xcb_get_property (3),
+.BR xcb_flush (3)
+.SH AUTHOR
+Michael Stapelberg <michael+xcb at stapelberg dot de>
diff --git a/libxcb/src/man/xcb-requests.3 b/libxcb/src/man/xcb-requests.3
new file mode 100644
index 000000000..278bcff13
--- /dev/null
+++ b/libxcb/src/man/xcb-requests.3
@@ -0,0 +1,165 @@
+.TH xcb-requests 3 2011-12-11 "XCB" "XCB examples"
+.ad l
+.SH NAME
+xcb-requests \- about request manpages
+.SH DESCRIPTION
+Every request in X11, like \fIMapWindow\fP, corresponds to a number of
+functions and data structures in XCB. For \fIMapWindow\fP, XCB provides the
+function \fIxcb_map_window\fP, which fills the \fIxcb_map_window_request_t\fP
+data structure and writes that to the X11 connection. Since the \fIMapWindow\fP
+request does not have a reply, this is the most simple case.
+
+.SH REPLIES
+
+Many requests have replies. For each reply, XCB provides at least a
+corresponding data structure and a function to return a pointer to a filled
+data structure. Let's take the \fIInternAtom\fP request as an example: XCB
+provides the \fIxcb_intern_atom_reply_t\fP data structure and
+\fIxcb_intern_atom_reply\fP function. For replies which are more complex (for
+example lists, such as in \fIxcb_list_fonts\fP), accessor functions are
+provided.
+
+.SH COOKIES
+
+XCB returns a cookie for each request you send. This is an XCB-specific data
+structure containing the sequence number with which the request was sent to the
+X11 server. To get any reply, you have to provide that cookie (so that XCB
+knows which of the waiting replies you want). Here is an example to illustrate
+the use of cookies:
+
+.nf
+.sp
+void my_example(xcb_connection *conn) {
+    xcb_intern_atom_cookie_t cookie;
+    xcb_intern_atom_reply_t *reply;
+
+    cookie = xcb_intern_atom(conn, 0, strlen("_NET_WM_NAME"), "_NET_WM_NAME");
+    /* ... do other work here if possible ... */
+    if ((reply = xcb_intern_atom_reply(conn, cookie, NULL))) {
+        printf("The _NET_WM_NAME atom has ID %u\n", reply->atom);
+    }
+    free(reply);
+}
+.fi
+
+.SH CHECKED VS. UNCHECKED
+
+The checked and unchecked suffixes for functions determine which kind of error
+handling is used for this specific request.
+
+For requests which have no reply (for example \fIxcb_map_window\fP), errors
+will be delivered to the event loop (you will receive an X11 event of type 0
+when calling \fIxcb_poll_for_event\fP).
+If you want to explicitly check for errors in a blocking fashion, call the
+_checked version of the function (for example \fIxcb_map_window_checked\fP) and
+use \fIxcb_request_check\fP.
+
+For requests which have a reply (for example \fIxcb_intern_atom\fP), errors
+will be checked when calling the reply function. To get errors in the event
+loop instead, use the _unchecked version of the function (for example
+\fIxcb_intern_atom_unchecked\fP).
+
+Here is an example which illustrates the four different ways of handling errors:
+
+.nf
+.sp
+/*
+ * Request without a reply, handling errors in the event loop (default)
+ *
+ */
+void my_example(xcb_connection *conn, xcb_window_t window) {
+    /* This is a request without a reply. Errors will be delivered to the event
+     * loop. Getting an error to xcb_map_window most likely is a bug in our
+     * program, so we don't need to check for that in a blocking way. */
+    xcb_map_window(conn, window);
+
+    /* ... of course your event loop would not be in the same function ... */
+    while ((event = xcb_wait_for_event(conn)) != NULL) {
+        if (event->response_type == 0) {
+            fprintf("Received X11 error %d\\n", error->error_code);
+            free(event);
+            continue;
+        }
+
+        /* ... handle a normal event ... */
+    }
+}
+
+/*
+ * Request without a reply, handling errors directly
+ *
+ */
+void my_example(xcb_connection *conn, xcb_window_t deco, xcb_window_t window) {
+    /* A reparenting window manager wants to know whether a new window was
+     * successfully reparented. If not (because the window got destroyed
+     * already, for example), it does not make sense to map an empty window
+     * decoration at all, so we need to know this right now. */
+    xcb_void_cookie_t cookie = xcb_reparent_window_checked(conn, window,
+                                                           deco, 0, 0);
+    xcb_generic_error_t *error;
+    if ((error = xcb_request_check(conn, cookie))) {
+        fprintf(stderr, "Could not reparent the window\\n");
+        free(error);
+        return;
+    }
+
+    /* ... do window manager stuff here ... */
+}
+
+/*
+ * Request with a reply, handling errors directly (default)
+ *
+ */
+void my_example(xcb_connection *conn, xcb_window_t window) {
+    xcb_intern_atom_cookie_t cookie;
+    xcb_intern_atom_reply_t *reply;
+    xcb_generic_error_t *error;
+
+    cookie = xcb_intern_atom(c, 0, strlen("_NET_WM_NAME"), "_NET_WM_NAME");
+    /* ... do other work here if possible ... */
+    if ((reply = xcb_intern_atom_reply(c, cookie, &error))) {
+        printf("The _NET_WM_NAME atom has ID %u\n", reply->atom);
+        free(reply);
+    } else {
+        fprintf(stderr, "X11 Error %d\\n", error->error_code);
+        free(error);
+    }
+}
+
+/*
+ * Request with a reply, handling errors in the event loop
+ *
+ */
+void my_example(xcb_connection *conn, xcb_window_t window) {
+    xcb_intern_atom_cookie_t cookie;
+    xcb_intern_atom_reply_t *reply;
+
+    cookie = xcb_intern_atom_unchecked(c, 0, strlen("_NET_WM_NAME"),
+                                       "_NET_WM_NAME");
+    /* ... do other work here if possible ... */
+    if ((reply = xcb_intern_atom_reply(c, cookie, NULL))) {
+        printf("The _NET_WM_NAME atom has ID %u\n", reply->atom);
+        free(reply);
+    }
+
+    /* ... of course your event loop would not be in the same function ... */
+    while ((event = xcb_wait_for_event(conn)) != NULL) {
+        if (event->response_type == 0) {
+            fprintf("Received X11 error %d\\n", error->error_code);
+            free(event);
+            continue;
+        }
+
+        /* ... handle a normal event ... */
+    }
+}
+.fi
+
+.SH SEE ALSO
+.BR xcb_map_window (3),
+.BR xcb_intern_atom (3),
+.BR xcb_list_fonts (3),
+.BR xcb_poll_for_event (3),
+.BR xcb_request_check (3)
+.SH AUTHOR
+Michael Stapelberg <michael+xcb at stapelberg dot de>
diff --git a/libxcb/xcb-proto/doc/xml-xcb.txt b/libxcb/xcb-proto/doc/xml-xcb.txt
index 3c6a15519..705772736 100644
--- a/libxcb/xcb-proto/doc/xml-xcb.txt
+++ b/libxcb/xcb-proto/doc/xml-xcb.txt
@@ -284,3 +284,38 @@ Expressions
 
   This element represents the number of bits set in the expression.
 
+Documentation
+-------------
+
+  Documentation for each request, reply or event is stored in the appropriate
+  element using a <doc> element. The <doc> element can contain the following
+  elements:
+
+<brief>brief description</brief>
+
+  A short description of the request, reply or event. For example "makes a
+  window visible" for MapWindow. This will end up in the manpage NAME section
+  and in the doxygen @brief description.
+
+<description><![CDATA[longer description]]></description>
+
+  The full description. Use `` to highlight words, such as "Draws
+  `points_len`-1 lines between each pair of points…"
+
+<example><![CDATA[example code]]</description>
+
+  Example C code illustrating the usage of the particular request, reply or
+  event.
+
+<field name="name">field description</field>
+
+  The full description for the specified field. Depending on the context, this
+  is either a request parameter or a reply/event datastructure field.
+
+<error type="type">error description</field>
+
+  The full description for an error which can occur due to this request.
+
+<see type="request" name="name" />
+
+  A reference to another relevant program, function, request or event.
diff --git a/libxcb/xcb-proto/src/xcb.xsd b/libxcb/xcb-proto/src/xcb.xsd
index 89e27846f..cfa90c9c2 100644
--- a/libxcb/xcb-proto/src/xcb.xsd
+++ b/libxcb/xcb-proto/src/xcb.xsd
@@ -1,314 +1,375 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Josh Triplett.  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 BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the names of the authors or their

-institutions shall not be used in advertising or otherwise to promote the

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

-authorization from the authors.

--->

-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-

-  <!-- The root element -->

-  <xsd:element name="xcb">

-    <xsd:complexType>

-      <xsd:group ref="macro" minOccurs="0" maxOccurs="unbounded" />

-      <xsd:attribute name="header" type="xsd:string" use="required" />

-      <xsd:attribute name="extension-xname" type="xsd:string" use="optional" />

-      <xsd:attribute name="extension-name"  type="xsd:string" use="optional" />

-      <xsd:attribute name="extension-multiword" type="xsd:boolean" use="optional" default="false" />

-      <xsd:attribute name="major-version"   type="xsd:integer" use="optional" />

-      <xsd:attribute name="minor-version"   type="xsd:integer" use="optional" />

-    </xsd:complexType>

-  </xsd:element>

-

-  <!-- Padding -->

-  <xsd:element name="pad">

-    <xsd:complexType>

-      <xsd:attribute name="bytes" type="xsd:integer" use="required" />

-    </xsd:complexType>

-  </xsd:element>

-

-  <!-- Type for fields or parameters with attributes "name" and "type" -->

-  <xsd:complexType name="var">

-    <xsd:attribute name="name" type="xsd:string" use="required" />

-    <xsd:attribute name="type" type="xsd:string" use="required" />

-    <xsd:attribute name="enum" type="xsd:string" use="optional" />

-    <xsd:attribute name="altenum" type="xsd:string" use="optional" />

-    <xsd:attribute name="mask" type="xsd:string" use="optional" />

-  </xsd:complexType>

-

-  <!-- case expression -->

-  <xsd:complexType name="caseexpr">

-    <xsd:sequence>

-      <!-- case expression: -->

-      <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />

-      <!-- match -->

-      <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />

-      <xsd:choice>

-        <xsd:element ref="switch" minOccurs="0" maxOccurs="unbounded" />

-      </xsd:choice>

-    </xsd:sequence>

-    <xsd:attribute name="name" type="xsd:string" use="optional" />

-  </xsd:complexType>

-

-  <!-- switch expression -->

-  <xsd:complexType name="switchexpr">

-    <xsd:sequence>

-      <!-- switch(expression) -->

-      <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />

-      <xsd:choice>

-        <!-- bitcase expression - bit test -->

-        <xsd:element name="bitcase" type="caseexpr" minOccurs="1" maxOccurs="unbounded" />

-      </xsd:choice>

-      <!-- default: -->

-      <xsd:group ref="fields" minOccurs="0" maxOccurs="1" />

-    </xsd:sequence>

-    <xsd:attribute name="name" type="xsd:string" use="required" />

-  </xsd:complexType>

-

-  <xsd:element name="switch" type="switchexpr" />

-

-  <!-- field replaces FIELD, PARAM, and REPLY. -->

-  <xsd:element name="field" type="var" />

-

-  <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type

-       are specified as attributes.  The content is an expression giving the

-       length. -->

-  <xsd:element name="list">

-    <xsd:complexType>

-      <xsd:complexContent>

-        <xsd:extension base="var">

-          <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />

-        </xsd:extension>

-      </xsd:complexContent>

-    </xsd:complexType>

-  </xsd:element>

-

-  <!-- Expressions -->

-  <xsd:group name="expression">

-    <xsd:choice>

-      <xsd:element name="op">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:group ref="expression" />

-            <xsd:group ref="expression" />

-          </xsd:sequence>

-          <xsd:attribute name="op" use="required">

-            <xsd:simpleType>

-              <xsd:restriction base="xsd:string">

-                <xsd:pattern value="\+|-|\*|/|&amp;|&lt;&lt;" />

-              </xsd:restriction>

-            </xsd:simpleType>

-          </xsd:attribute>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="unop">

-         <xsd:complexType>

-            <xsd:sequence>

-              <xsd:group ref="expression" />

-            </xsd:sequence>

-            <xsd:attribute name="op" use="required">

-              <xsd:simpleType>

-                <xsd:restriction base="xsd:string">

-                  <xsd:pattern value="~" />

-                </xsd:restriction>

-              </xsd:simpleType>

-            </xsd:attribute>

-         </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="fieldref" type="xsd:string" />

-      <xsd:element name="enumref">

-        <xsd:complexType>

-          <xsd:simpleContent>

-            <xsd:extension base="xsd:string">

-              <xsd:attribute name="ref" use="required" type="xsd:string" />

-            </xsd:extension>

-          </xsd:simpleContent>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="popcount">

-        <xsd:complexType>

-          <xsd:group ref="expression" />

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="sumof">

-        <xsd:complexType>

-          <xsd:attribute name="ref" use="required" type="xsd:string" />

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="value" type="dec-or-hex-integer" />

-      <xsd:element name="bit" type="xsd:integer" />

-    </xsd:choice>

-  </xsd:group>

-  

-  <!-- Fields in requests that are calculated from other information, not

-       supplied by the caller. -->

-  <xsd:element name="exprfield" >

-    <xsd:complexType>

-      <xsd:complexContent>

-        <xsd:extension base="var">

-          <xsd:group ref="expression" />

-        </xsd:extension>

-      </xsd:complexContent>

-    </xsd:complexType>

-  </xsd:element>

-

-  <!-- BITMASK/LISTofVALUE parameter pairs. -->

-  <xsd:element name="valueparam">

-    <xsd:complexType>

-      <xsd:attribute name="value-mask-type" type="xsd:string" use="required" />

-      <xsd:attribute name="value-mask-name" type="xsd:string" use="required" />

-      <xsd:attribute name="value-list-name" type="xsd:string" use="required" />

-    </xsd:complexType>

-  </xsd:element>

-

-  <xsd:group name="fields">

-    <xsd:choice>

-      <xsd:element ref="pad" />

-      <xsd:element ref="field" />

-      <xsd:element ref="list" />

-    </xsd:choice>

-  </xsd:group>

-

-  <!-- Type for a structure -->

-  <xsd:complexType name="struct">

-    <xsd:sequence>

-      <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />

-      <xsd:choice minOccurs="0" maxOccurs="1">

-        <xsd:element ref="switch" />

-      </xsd:choice>

-    </xsd:sequence>

-    <xsd:attribute name="name" type="xsd:string" use="required" />

-  </xsd:complexType>

-

-  <!-- Type for a packet structure -->

-  <xsd:complexType name="packet-struct">

-    <xsd:group ref="fields" minOccurs="0" maxOccurs="unbounded" />

-    <xsd:attribute name="name" type="xsd:string" use="required" />

-    <xsd:attribute name="number" type="xsd:integer" use="required" />

-  </xsd:complexType>

-

-  <!-- Type for a packet structure copy -->

-  <xsd:complexType name="packet-struct-copy">

-    <xsd:attribute name="name" type="xsd:string" use="required" />

-    <xsd:attribute name="number" type="xsd:integer" use="required" />

-    <xsd:attribute name="ref" type="xsd:string" use="required" />

-  </xsd:complexType>

-

-  <!-- Type for hex integers -->

-  <xsd:simpleType name="hex-integer">

-    <xsd:restriction base="xsd:string">

-      <xsd:pattern value="0x[0-9a-fA-F]+" />

-    </xsd:restriction>

-  </xsd:simpleType>

-

-  <!-- Type for integers in either decimal or hex -->

-  <xsd:simpleType name="dec-or-hex-integer">

-    <xsd:union memberTypes="xsd:integer hex-integer" />

-  </xsd:simpleType>

-

-  <xsd:group name="macro">

-    <xsd:choice>

-      <xsd:element name="request">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:choice minOccurs="0" maxOccurs="unbounded">

-              <xsd:group ref="fields" />

-              <xsd:element ref="exprfield" />

-              <xsd:element ref="valueparam" />

-            </xsd:choice>

-            <xsd:choice minOccurs="0" maxOccurs="1">

-              <xsd:element ref="switch" />

-            </xsd:choice>

-            <xsd:element name="reply" minOccurs="0" maxOccurs="1">

-              <xsd:complexType>

-                <xsd:sequence>

-                  <xsd:choice minOccurs="1" maxOccurs="unbounded">

-                    <xsd:group ref="fields" />

-                    <xsd:element ref="valueparam" />

-                  </xsd:choice>

-                  <xsd:choice minOccurs="0" maxOccurs="1">

-                    <xsd:element ref="switch" />

-                  </xsd:choice>

-                </xsd:sequence>

-              </xsd:complexType>

-            </xsd:element>

-          </xsd:sequence>

-          <xsd:attribute name="name" type="xsd:string" use="required" />

-          <xsd:attribute name="opcode" type="xsd:integer" use="required" />

-          <xsd:attribute name="combine-adjacent" type="xsd:boolean"

-                         use="optional"/>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="event">

-        <xsd:complexType>

-          <xsd:complexContent>

-            <xsd:extension base="packet-struct">

-              <xsd:attribute name="no-sequence-number" type="xsd:boolean"

-                             use="optional" />

-            </xsd:extension>

-          </xsd:complexContent>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="eventcopy" type="packet-struct-copy" />

-      <xsd:element name="error" type="packet-struct" />

-      <xsd:element name="errorcopy" type="packet-struct-copy" />

-      <xsd:element name="struct" type="struct" />

-      <xsd:element name="union" type="struct" />

-      <xsd:element name="xidtype">

-        <xsd:complexType>

-          <xsd:attribute name="name" type="xsd:string" use="required" />

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="xidunion">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="type" type="xsd:string"

-                         minOccurs="1" maxOccurs="unbounded" />

-          </xsd:sequence>

-          <xsd:attribute name="name" type="xsd:string" use="required" />

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="enum">

-        <xsd:complexType>

-          <xsd:sequence minOccurs="1" maxOccurs="unbounded">

-            <xsd:element name="item">

-              <xsd:complexType>

-                <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />

-                <xsd:attribute name="name" type="xsd:string" use="required" />

-              </xsd:complexType>

-            </xsd:element>

-          </xsd:sequence>

-          <xsd:attribute name="name" type="xsd:string" use="required" />

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="typedef">

-        <xsd:complexType>

-          <xsd:attribute name="oldname" type="xsd:string" use="required" />

-          <xsd:attribute name="newname" type="xsd:string" use="required" />

-        </xsd:complexType>

-      </xsd:element>

-      <!-- The import element allows a protocol description to reference the

-           declarations of another protocol description. -->

-      <xsd:element name="import" type="xsd:string" />

-    </xsd:choice>

-  </xsd:group>

-</xsd:schema>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Josh Triplett.  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 BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <!-- The root element -->
+  <xsd:element name="xcb">
+    <xsd:complexType>
+      <xsd:group ref="macro" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:attribute name="header" type="xsd:string" use="required" />
+      <xsd:attribute name="extension-xname" type="xsd:string" use="optional" />
+      <xsd:attribute name="extension-name"  type="xsd:string" use="optional" />
+      <xsd:attribute name="extension-multiword" type="xsd:boolean" use="optional" default="false" />
+      <xsd:attribute name="major-version"   type="xsd:integer" use="optional" />
+      <xsd:attribute name="minor-version"   type="xsd:integer" use="optional" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- Padding -->
+  <xsd:element name="pad">
+    <xsd:complexType>
+      <xsd:attribute name="bytes" type="xsd:integer" use="required" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- Type for fields or parameters with attributes "name" and "type" -->
+  <xsd:complexType name="var">
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="type" type="xsd:string" use="required" />
+    <xsd:attribute name="enum" type="xsd:string" use="optional" />
+    <xsd:attribute name="altenum" type="xsd:string" use="optional" />
+    <xsd:attribute name="mask" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <!-- case expression -->
+  <xsd:complexType name="caseexpr">
+    <xsd:sequence>
+      <!-- case expression: -->
+      <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />
+      <!-- match -->
+      <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
+      <xsd:choice>
+        <xsd:element ref="switch" minOccurs="0" maxOccurs="unbounded" />
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="optional" />
+  </xsd:complexType>
+
+  <!-- switch expression -->
+  <xsd:complexType name="switchexpr">
+    <xsd:sequence>
+      <!-- switch(expression) -->
+      <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />
+      <xsd:choice>
+        <!-- bitcase expression - bit test -->
+        <xsd:element name="bitcase" type="caseexpr" minOccurs="1" maxOccurs="unbounded" />
+      </xsd:choice>
+      <!-- default: -->
+      <xsd:group ref="fields" minOccurs="0" maxOccurs="1" />
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <xsd:element name="switch" type="switchexpr" />
+
+  <!-- field replaces FIELD, PARAM, and REPLY. -->
+  <xsd:element name="field" type="var" />
+
+  <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type
+       are specified as attributes.  The content is an expression giving the
+       length. -->
+  <xsd:element name="list">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="var">
+          <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- Expressions -->
+  <xsd:group name="expression">
+    <xsd:choice>
+      <xsd:element name="op">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:group ref="expression" />
+            <xsd:group ref="expression" />
+          </xsd:sequence>
+          <xsd:attribute name="op" use="required">
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:pattern value="\+|-|\*|/|&amp;|&lt;&lt;" />
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="unop">
+         <xsd:complexType>
+            <xsd:sequence>
+              <xsd:group ref="expression" />
+            </xsd:sequence>
+            <xsd:attribute name="op" use="required">
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                  <xsd:pattern value="~" />
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:attribute>
+         </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="fieldref" type="xsd:string" />
+      <xsd:element name="enumref">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="ref" use="required" type="xsd:string" />
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="popcount">
+        <xsd:complexType>
+          <xsd:group ref="expression" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="sumof">
+        <xsd:complexType>
+          <xsd:attribute name="ref" use="required" type="xsd:string" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="value" type="dec-or-hex-integer" />
+      <xsd:element name="bit" type="xsd:integer" />
+    </xsd:choice>
+  </xsd:group>
+  
+  <!-- Fields in requests that are calculated from other information, not
+       supplied by the caller. -->
+  <xsd:element name="exprfield" >
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="var">
+          <xsd:group ref="expression" />
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- BITMASK/LISTofVALUE parameter pairs. -->
+  <xsd:element name="valueparam">
+    <xsd:complexType>
+      <xsd:attribute name="value-mask-type" type="xsd:string" use="required" />
+      <xsd:attribute name="value-mask-name" type="xsd:string" use="required" />
+      <xsd:attribute name="value-list-name" type="xsd:string" use="required" />
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:group name="fields">
+    <xsd:choice>
+      <xsd:element ref="pad" />
+      <xsd:element ref="field" />
+      <xsd:element ref="list" />
+    </xsd:choice>
+  </xsd:group>
+
+  <!-- Type for a structure -->
+  <xsd:complexType name="struct">
+    <xsd:sequence>
+      <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
+      <xsd:choice minOccurs="0" maxOccurs="1">
+        <xsd:element ref="switch" />
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <!-- Type for a packet structure -->
+  <xsd:complexType name="packet-struct">
+    <xsd:sequence>
+      <xsd:group ref="fields" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="number" type="xsd:integer" use="required" />
+  </xsd:complexType>
+
+  <!-- Type for a packet structure copy -->
+  <xsd:complexType name="packet-struct-copy">
+    <xsd:attribute name="name" type="xsd:string" use="required" />
+    <xsd:attribute name="number" type="xsd:integer" use="required" />
+    <xsd:attribute name="ref" type="xsd:string" use="required" />
+  </xsd:complexType>
+
+  <!-- Type for hex integers -->
+  <xsd:simpleType name="hex-integer">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="0x[0-9a-fA-F]+" />
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <!-- Type for integers in either decimal or hex -->
+  <xsd:simpleType name="dec-or-hex-integer">
+    <xsd:union memberTypes="xsd:integer hex-integer" />
+  </xsd:simpleType>
+
+  <!-- Type for documentation -->
+  <xsd:group name="doc-fields">
+    <xsd:sequence>
+      <xsd:element name="field">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:group name="error-fields">
+    <xsd:sequence>
+      <xsd:element name="error">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute name="type" type="xsd:string" />
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:group name="see-fields">
+    <xsd:sequence>
+      <xsd:element name="see">
+        <xsd:complexType>
+          <xsd:attribute name="name" type="xsd:string" />
+          <xsd:attribute name="type" type="xsd:string" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:element name="doc">
+    <xsd:complexType mixed="true">
+      <xsd:sequence>
+        <xsd:element name="brief" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        <xsd:element name="example" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        <xsd:group ref="doc-fields" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:group ref="error-fields" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:group ref="see-fields" minOccurs="0" maxOccurs="unbounded" />
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:group name="macro">
+    <xsd:choice>
+      <xsd:element name="request">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+              <xsd:group ref="fields" />
+              <xsd:element ref="exprfield" />
+              <xsd:element ref="valueparam" />
+            </xsd:choice>
+            <xsd:choice minOccurs="0" maxOccurs="1">
+              <xsd:element ref="switch" />
+            </xsd:choice>
+            <xsd:element name="reply" minOccurs="0" maxOccurs="1">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                    <xsd:group ref="fields" />
+                    <xsd:element ref="valueparam" />
+                  </xsd:choice>
+                  <xsd:choice minOccurs="0" maxOccurs="1">
+                    <xsd:element ref="switch" />
+                  </xsd:choice>
+                  <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
+          </xsd:sequence>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+          <xsd:attribute name="opcode" type="xsd:integer" use="required" />
+          <xsd:attribute name="combine-adjacent" type="xsd:boolean"
+                         use="optional"/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="event">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="packet-struct">
+              <xsd:sequence>
+                <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
+              </xsd:sequence>
+              <xsd:attribute name="no-sequence-number" type="xsd:boolean"
+                             use="optional" />
+            </xsd:extension>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="eventcopy" type="packet-struct-copy" />
+      <xsd:element name="error" type="packet-struct" />
+      <xsd:element name="errorcopy" type="packet-struct-copy" />
+      <xsd:element name="struct" type="struct" />
+      <xsd:element name="union" type="struct" />
+      <xsd:element name="xidtype">
+        <xsd:complexType>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="xidunion">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="type" type="xsd:string"
+                         minOccurs="1" maxOccurs="unbounded" />
+          </xsd:sequence>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="enum">
+        <xsd:complexType>
+          <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+            <xsd:element name="item">
+              <xsd:complexType>
+                <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
+                <xsd:attribute name="name" type="xsd:string" use="required" />
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element ref="doc" minOccurs="0" maxOccurs="1" />
+          </xsd:sequence>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="typedef">
+        <xsd:complexType>
+          <xsd:attribute name="oldname" type="xsd:string" use="required" />
+          <xsd:attribute name="newname" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
+      <!-- The import element allows a protocol description to reference the
+           declarations of another protocol description. -->
+      <xsd:element name="import" type="xsd:string" />
+    </xsd:choice>
+  </xsd:group>
+</xsd:schema>
diff --git a/libxcb/xcb-proto/src/xproto.xml b/libxcb/xcb-proto/src/xproto.xml
index 42a6852a1..bf4dcbf0f 100644
--- a/libxcb/xcb-proto/src/xproto.xml
+++ b/libxcb/xcb-proto/src/xproto.xml
@@ -307,6 +307,44 @@ authorization from the authors.
     <field type="CARD16" name="state" mask="KeyButMask" />
     <field type="BOOL" name="same_screen" />
     <pad bytes="1" />
+    <doc>
+      <brief>a key was pressed/released</brief>
+      <field name="detail"><![CDATA[
+The keycode (a number representing a physical key on the keyboard) of the key
+which was pressed.
+      ]]></field>
+      <field name="time"><![CDATA[
+Time when the event was generated (in milliseconds).
+      ]]></field>
+      <field name="root"><![CDATA[
+The root window of `child`.
+      ]]></field>
+      <field name="same_screen"><![CDATA[
+Whether the `event` window is on the same screen as the `root` window.
+      ]]></field>
+      <field name="event_x"><![CDATA[
+If `same_screen` is true, this is the X coordinate relative to the `event`
+window's origin. Otherwise, `event_x` will be set to zero.
+      ]]></field>
+      <field name="event_y"><![CDATA[
+If `same_screen` is true, this is the Y coordinate relative to the `event`
+window's origin. Otherwise, `event_y` will be set to zero.
+      ]]></field>
+      <field name="root_x"><![CDATA[
+The X coordinate of the pointer relative to the `root` window at the time of
+the event.
+      ]]></field>
+      <field name="root_y"><![CDATA[
+The Y coordinate of the pointer relative to the `root` window at the time of
+the event.
+      ]]></field>
+      <field name="state"><![CDATA[
+The logical state of the pointer buttons and modifier keys just prior to the
+event.
+      ]]></field>
+      <see type="request" name="GrabKey" />
+      <see type="request" name="GrabKeyboard" />
+    </doc>
   </event>
 
   <eventcopy name="KeyRelease" number="3" ref="KeyPress" />
@@ -333,6 +371,44 @@ authorization from the authors.
     <field type="CARD16" name="state" mask="KeyButMask" />
     <field type="BOOL" name="same_screen" />
     <pad bytes="1" />
+    <doc>
+      <brief>a mouse button was pressed/released</brief>
+      <field name="detail"><![CDATA[
+The keycode (a number representing a physical key on the keyboard) of the key
+which was pressed.
+      ]]></field>
+      <field name="time"><![CDATA[
+Time when the event was generated (in milliseconds).
+      ]]></field>
+      <field name="root"><![CDATA[
+The root window of `child`.
+      ]]></field>
+      <field name="same_screen"><![CDATA[
+Whether the `event` window is on the same screen as the `root` window.
+      ]]></field>
+      <field name="event_x"><![CDATA[
+If `same_screen` is true, this is the X coordinate relative to the `event`
+window's origin. Otherwise, `event_x` will be set to zero.
+      ]]></field>
+      <field name="event_y"><![CDATA[
+If `same_screen` is true, this is the Y coordinate relative to the `event`
+window's origin. Otherwise, `event_y` will be set to zero.
+      ]]></field>
+      <field name="root_x"><![CDATA[
+The X coordinate of the pointer relative to the `root` window at the time of
+the event.
+      ]]></field>
+      <field name="root_y"><![CDATA[
+The Y coordinate of the pointer relative to the `root` window at the time of
+the event.
+      ]]></field>
+      <field name="state"><![CDATA[
+The logical state of the pointer buttons and modifier keys just prior to the
+event.
+      ]]></field>
+      <see type="request" name="GrabButton" />
+      <see type="request" name="GrabPointer" />
+    </doc>
   </event>
 
   <eventcopy name="ButtonRelease" number="5" ref="ButtonPress" />
@@ -356,6 +432,44 @@ authorization from the authors.
     <field type="CARD16" name="state" mask="KeyButMask" />
     <field type="BOOL" name="same_screen" />
     <pad bytes="1" />
+    <doc>
+      <brief>a key was pressed</brief>
+      <field name="detail"><![CDATA[
+The keycode (a number representing a physical key on the keyboard) of the key
+which was pressed.
+      ]]></field>
+      <field name="time"><![CDATA[
+Time when the event was generated (in milliseconds).
+      ]]></field>
+      <field name="root"><![CDATA[
+The root window of `child`.
+      ]]></field>
+      <field name="same_screen"><![CDATA[
+Whether the `event` window is on the same screen as the `root` window.
+      ]]></field>
+      <field name="event_x"><![CDATA[
+If `same_screen` is true, this is the X coordinate relative to the `event`
+window's origin. Otherwise, `event_x` will be set to zero.
+      ]]></field>
+      <field name="event_y"><![CDATA[
+If `same_screen` is true, this is the Y coordinate relative to the `event`
+window's origin. Otherwise, `event_y` will be set to zero.
+      ]]></field>
+      <field name="root_x"><![CDATA[
+The X coordinate of the pointer relative to the `root` window at the time of
+the event.
+      ]]></field>
+      <field name="root_y"><![CDATA[
+The Y coordinate of the pointer relative to the `root` window at the time of
+the event.
+      ]]></field>
+      <field name="state"><![CDATA[
+The logical state of the pointer buttons and modifier keys just prior to the
+event.
+      ]]></field>
+      <see type="request" name="GrabKey" />
+      <see type="request" name="GrabKeyboard" />
+    </doc>
   </event>
 
   <enum name="NotifyDetail">
@@ -389,6 +503,34 @@ authorization from the authors.
     <field type="CARD16" name="state" mask="KeyButMask" />
     <field type="BYTE" name="mode" enum="NotifyMode" />
     <field type="BYTE" name="same_screen_focus" />
+    <doc>
+      <brief>the pointer is in a different window</brief>
+      <field name="event"><![CDATA[
+The reconfigured window or its parent, depending on whether `StructureNotify`
+or `SubstructureNotify` was selected.
+      ]]></field>
+      <field name="window"><![CDATA[
+The window that was unmapped.
+      ]]></field>
+      <field name="root"><![CDATA[
+The root window for the final cursor position.
+      ]]></field>
+      <field name="root_x"><![CDATA[
+The pointer X coordinate relative to `root`'s origin at the time of the event.
+      ]]></field>
+      <field name="root_y"><![CDATA[
+The pointer Y coordinate relative to `root`'s origin at the time of the event.
+      ]]></field>
+      <field name="event_x"><![CDATA[
+If `event` is on the same screen as `root`, this is the pointer X coordinate
+relative to the event window's origin.
+      ]]></field>
+      <field name="event_y"><![CDATA[
+If `event` is on the same screen as `root`, this is the pointer Y coordinate
+relative to the event window's origin.
+      ]]></field>
+      <field name="mode" />
+    </doc>
   </event>
 
   <eventcopy name="LeaveNotify" number="8" ref="EnterNotify" />
@@ -398,6 +540,16 @@ authorization from the authors.
     <field type="WINDOW" name="event" />
     <field type="BYTE" name="mode" enum="NotifyMode" />
     <pad bytes="3" />
+    <doc>
+      <brief>NOT YET DOCUMENTED</brief>
+      <field name="event"><![CDATA[
+The window on which the focus event was generated. This is the window used by
+the X server to report the event.
+      ]]></field>
+      <!-- enum documentation is sufficient -->
+      <field name="detail" />
+      <field name="mode" />
+    </doc>
   </event>
 
   <eventcopy name="FocusOut" number="10" ref="FocusIn" />
@@ -415,6 +567,32 @@ authorization from the authors.
     <field type="CARD16" name="height" />
     <field type="CARD16" name="count" />
     <pad bytes="2" />
+    <doc>
+      <brief>NOT YET DOCUMENTED</brief>
+      <field name="window"><![CDATA[
+The exposed (damaged) window.
+      ]]></field>
+      <field name="x"><![CDATA[
+The X coordinate of the left-upper corner of the exposed rectangle, relative to
+the `window`'s origin.
+      ]]></field>
+      <field name="y"><![CDATA[
+The Y coordinate of the left-upper corner of the exposed rectangle, relative to
+the `window`'s origin.
+      ]]></field>
+      <field name="width"><![CDATA[
+The width of the exposed rectangle.
+      ]]></field>
+      <field name="height"><![CDATA[
+The height of the exposed rectangle.
+      ]]></field>
+      <field name="count"><![CDATA[
+The amount of `Expose` events following this one. Simple applications that do
+not want to optimize redisplay by distinguishing between subareas of its window
+can just ignore all Expose events with nonzero counts and perform full
+redisplays on events with zero counts.
+      ]]></field>
+    </doc>
   </event>
 
   <event name="GraphicsExposure" number="13">
@@ -468,6 +646,17 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="WINDOW" name="event" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>a window is destroyed</brief>
+      <field name="event"><![CDATA[
+The reconfigured window or its parent, depending on whether `StructureNotify`
+or `SubstructureNotify` was selected.
+      ]]></field>
+      <field name="window"><![CDATA[
+The window that is destroyed.
+      ]]></field>
+      <see type="request" name="DestroyWindow" />
+    </doc>
   </event>
 
   <event name="UnmapNotify" number="18">
@@ -476,6 +665,21 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <field type="BOOL" name="from_configure" />
     <pad bytes="3" />
+    <doc>
+      <brief>a window is unmapped</brief>
+      <field name="event"><![CDATA[
+The reconfigured window or its parent, depending on whether `StructureNotify`
+or `SubstructureNotify` was selected.
+      ]]></field>
+      <field name="window"><![CDATA[
+The window that was unmapped.
+      ]]></field>
+      <field name="from_configure"><![CDATA[
+Set to 1 if the event was generated as a result of a resizing of the window's
+parent when `window` had a win_gravity of `UnmapGravity`.
+      ]]></field>
+      <see type="request" name="UnmapWindow" />
+    </doc>
   </event>
 
   <event name="MapNotify" number="19">
@@ -484,12 +688,36 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <field type="BOOL" name="override_redirect" />
     <pad bytes="3" />
+    <doc>
+      <brief>a window was mapped</brief>
+      <field name="event"><![CDATA[
+The window which was mapped or its parent, depending on whether
+`StructureNotify` or `SubstructureNotify` was selected.
+      ]]></field>
+      <field name="window"><![CDATA[
+The window that was mapped.
+      ]]></field>
+      <field name="override_redirect"><![CDATA[
+Window managers should ignore this window if `override_redirect` is 1.
+      ]]></field>
+      <see type="request" name="MapWindow" />
+    </doc>
   </event>
 
   <event name="MapRequest" number="20">
     <pad bytes="1" />
     <field type="WINDOW" name="parent" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>window wants to be mapped</brief>
+      <field name="parent"><![CDATA[
+The parent of `window`.
+      ]]></field>
+      <field name="window"><![CDATA[
+The window to be mapped.
+      ]]></field>
+      <see type="request" name="MapWindow" />
+    </doc>
   </event>
 
   <event name="ReparentNotify" number="21">
@@ -515,6 +743,42 @@ authorization from the authors.
     <field type="CARD16" name="border_width" />
     <field type="BOOL" name="override_redirect" />
     <pad bytes="1" />
+    <doc>
+      <brief>NOT YET DOCUMENTED</brief>
+      <field name="event"><![CDATA[
+The reconfigured window or its parent, depending on whether `StructureNotify`
+or `SubstructureNotify` was selected.
+      ]]></field>
+      <field name="window"><![CDATA[
+The window whose size, position, border, and/or stacking order was changed.
+      ]]></field>
+      <field name="above_sibling"><![CDATA[
+If `XCB_NONE`, the `window` is on the bottom of the stack with respect to
+sibling windows. However, if set to a sibling window, the `window` is placed on
+top of this sibling window.
+      ]]></field>
+      <field name="x"><![CDATA[
+The X coordinate of the upper-left outside corner of `window`, relative to the
+parent window's origin.
+      ]]></field>
+      <field name="y"><![CDATA[
+The Y coordinate of the upper-left outside corner of `window`, relative to the
+parent window's origin.
+      ]]></field>
+      <field name="width"><![CDATA[
+The inside width of `window`, not including the border.
+      ]]></field>
+      <field name="height"><![CDATA[
+The inside height of `window`, not including the border.
+      ]]></field>
+      <field name="border_width"><![CDATA[
+The border width of `window`.
+      ]]></field>
+      <field name="override_redirect"><![CDATA[
+Window managers should ignore this window if `override_redirect` is 1.
+      ]]></field>
+      <see type="request" name="FreeColormap" />
+    </doc>
   </event>
 
   <event name="ConfigureRequest" number="23">
@@ -548,6 +812,14 @@ authorization from the authors.
   <enum name="Place">
     <item name="OnTop">   <value>0</value></item>
     <item name="OnBottom"><value>1</value></item>
+    <doc>
+      <field name="OnTop"><![CDATA[
+The window is now on top of all siblings.
+      ]]></field>
+      <field name="OnBottom"><![CDATA[
+The window is now below all siblings.
+      ]]></field>
+    </doc>
   </enum>
 
   <event name="CirculateNotify" number="26">
@@ -557,6 +829,19 @@ authorization from the authors.
     <pad bytes="4" />
     <field type="BYTE" name="place" enum="Place" />
     <pad bytes="3" />
+    <doc>
+      <brief>NOT YET DOCUMENTED</brief>
+      <field name="event"><![CDATA[
+Either the restacked window or its parent, depending on whether
+`StructureNotify` or `SubstructureNotify` was selected.
+      ]]></field>
+      <field name="window"><![CDATA[
+The restacked window.
+      ]]></field>
+      <!-- the enum doc is sufficient -->
+      <field name="place" />
+      <see type="request" name="CirculateWindow" />
+    </doc>
   </event>
 
   <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify" />
@@ -573,6 +858,21 @@ authorization from the authors.
     <field type="TIMESTAMP" name="time" />
     <field type="BYTE" name="state" enum="Property" />
     <pad bytes="3" />
+    <doc>
+      <brief>a window property changed</brief>
+      <field name="window"><![CDATA[
+The window whose associated property was changed.
+      ]]></field>
+      <field name="atom"><![CDATA[
+The property's atom, to indicate which property was changed.
+      ]]></field>
+      <field name="time"><![CDATA[
+A timestamp of the server time when the property was changed.
+      ]]></field>
+      <!-- enum documentation is sufficient -->
+      <field name="state" />
+      <see type="request" name="ChangeProperty" />
+    </doc>
   </event>
 
   <event name="SelectionClear" number="29">
@@ -681,6 +981,14 @@ authorization from the authors.
   <enum name="ColormapState">
     <item name="Uninstalled"><value>0</value></item>
     <item name="Installed">  <value>1</value></item>
+    <doc>
+      <field name="Uninstalled"><![CDATA[
+The colormap was uninstalled.
+      ]]></field>
+      <field name="Installed"><![CDATA[
+The colormap was installed.
+      ]]></field>
+    </doc>
   </enum>
 
   <enum name="Colormap">
@@ -694,6 +1002,22 @@ authorization from the authors.
     <field type="BOOL" name="new" />
     <field type="BYTE" name="state" enum="ColormapState" />
     <pad bytes="2" />
+    <doc>
+      <brief>the colormap for some window changed</brief>
+      <field name="window"><![CDATA[
+The window whose associated colormap is changed, installed or uninstalled.
+      ]]></field>
+      <field name="colormap"><![CDATA[
+The colormap which is changed, installed or uninstalled. This is `XCB_NONE`
+when the colormap is changed by a call to `FreeColormap`.
+      ]]></field>
+      <field name="_new"><![CDATA[
+Indicates whether the colormap was changed (1) or installed/uninstalled (0).
+      ]]></field>
+      <!-- enum doc is sufficient -->
+      <field name="state" />
+      <see type="request" name="FreeColormap" />
+    </doc>
   </event>
 
   <union name="ClientMessageData">
@@ -709,6 +1033,26 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <field type="ATOM" name="type" />
     <field type="ClientMessageData" name="data" />
+    <doc>
+      <brief>NOT YET DOCUMENTED</brief>
+      <description><![CDATA[
+This event represents a ClientMessage, sent by another X11 client. An example
+is a client sending the `_NET_WM_STATE` ClientMessage to the root window
+to indicate the fullscreen window state, effectively requesting that the window
+manager puts it into fullscreen mode.
+      ]]></description>
+      <field name="format"><![CDATA[
+Specifies how to interpret `data`. Can be either 8, 16 or 32.
+      ]]></field>
+      <field name="type"><![CDATA[
+An atom which indicates how the data should be interpreted by the receiving
+client.
+      ]]></field>
+      <field name="data"><![CDATA[
+The data itself (20 bytes max).
+      ]]></field>
+      <see type="request" name="SendEvent" />
+    </doc>
   </event>
 
   <enum name="Mapping">
@@ -723,6 +1067,17 @@ authorization from the authors.
     <field type="KEYCODE" name="first_keycode" />
     <field type="CARD8" name="count" />
     <pad bytes="1" />
+    <doc>
+      <brief>keyboard mapping changed</brief>
+      <!-- enum documentation is sufficient -->
+      <field name="request" />
+      <field name="first_keycode"><![CDATA[
+The first number in the range of the altered mapping.
+      ]]></field>
+      <field name="count"><![CDATA[
+The number of keycodes altered.
+      ]]></field>
+    </doc>
   </event>
 
 
@@ -791,6 +1146,106 @@ authorization from the authors.
     <item name="DontPropagate">   <bit>12</bit></item>
     <item name="Colormap">        <bit>13</bit></item>
     <item name="Cursor">          <bit>14</bit></item>
+    <doc>
+      <field name="BackPixmap"><![CDATA[
+Overrides the default background-pixmap. The background pixmap and window must
+have the same root and same depth. Any size pixmap can be used, although some
+sizes may be faster than others.
+
+If `XCB_BACK_PIXMAP_NONE` is specified, the window has no defined background.
+The server may fill the contents with the previous screen contents or with
+contents of its own choosing.
+
+If `XCB_BACK_PIXMAP_PARENT_RELATIVE` is specified, the parent's background is
+used, but the window must have the same depth as the parent (or a Match error
+results).   The parent's background is tracked, and the current version is
+used each time the window background is required.
+      ]]></field>
+      <field name="BackPixel"><![CDATA[
+Overrides `BackPixmap`. A pixmap of undefined size filled with the specified
+background pixel is used for the background. Range-checking is not performed,
+the background pixel is truncated to the appropriate number of bits.
+      ]]></field>
+      <field name="BorderPixmap"><![CDATA[
+Overrides the default border-pixmap. The border pixmap and window must have the
+same root and the same depth. Any size pixmap can be used, although some sizes
+may be faster than others.
+
+The special value `XCB_COPY_FROM_PARENT` means the parent's border pixmap is
+copied (subsequent changes to the parent's border attribute do not affect the
+child), but the window must have the same depth as the parent.
+      ]]></field>
+      <field name="BorderPixel"><![CDATA[
+Overrides `BorderPixmap`. A pixmap of undefined size filled with the specified
+border pixel is used for the border. Range checking is not performed on the
+border-pixel value, it is truncated to the appropriate number of bits.
+      ]]></field>
+      <field name="BitGravity"><![CDATA[
+Defines which region of the window should be retained if the window is resized.
+      ]]></field>
+      <field name="WinGravity"><![CDATA[
+Defines how the window should be repositioned if the parent is resized (see
+`ConfigureWindow`).
+      ]]></field>
+      <field name="BackingStore"><![CDATA[
+A backing-store of `WhenMapped` advises the server that maintaining contents of
+obscured regions when the window is mapped would be beneficial. A backing-store
+of `Always` advises the server that maintaining contents even when the window
+is unmapped would be beneficial. In this case, the server may generate an
+exposure event when the window is created. A value of `NotUseful` advises the
+server that maintaining contents is unnecessary, although a server may still
+choose to maintain contents while the window is mapped. Note that if the server
+maintains contents, then the server should maintain complete contents not just
+the region within the parent boundaries, even if the window is larger than its
+parent. While the server maintains contents, exposure events will not normally
+be generated, but the server may stop maintaining contents at any time.
+      ]]></field>
+      <field name="BackingPlanes"><![CDATA[
+The backing-planes indicates (with bits set to 1) which bit planes of the
+window hold dynamic data that must be preserved in backing-stores and during
+save-unders.
+      ]]></field>
+      <field name="BackingPixel"><![CDATA[
+The backing-pixel specifies what value to use in planes not covered by
+backing-planes. The server is free to save only the specified bit planes in the
+backing-store or save-under and regenerate the remaining planes with the
+specified pixel value. Any bits beyond the specified depth of the window in
+these values are simply ignored.
+      ]]></field>
+      <field name="OverrideRedirect"><![CDATA[
+The override-redirect specifies whether map and configure requests on this
+window should override a SubstructureRedirect on the parent, typically to
+inform a window manager not to tamper with the window.
+      ]]></field>
+      <field name="SaveUnder"><![CDATA[
+If 1, the server is advised that when this window is mapped, saving the
+contents of windows it obscures would be beneficial.
+      ]]></field>
+      <field name="EventMask"><![CDATA[
+The event-mask defines which events the client is interested in for this window
+(or for some event types, inferiors of the window).
+      ]]></field>
+      <field name="DontPropagate"><![CDATA[
+The do-not-propagate-mask defines which events should not be propagated to
+ancestor windows when no client has the event type selected in this window.
+      ]]></field>
+      <field name="Colormap"><![CDATA[
+The colormap specifies the colormap that best reflects the true colors of the window. Servers
+capable of supporting multiple hardware colormaps may use this information, and window man-
+agers may use it for InstallColormap requests. The colormap must have the same visual type
+and root as the window (or a Match error results). If CopyFromParent is specified, the parent's
+colormap is copied (subsequent changes to the parent's colormap attribute do not affect the child).
+However, the window must have the same visual type as the parent (or a Match error results),
+and the parent must not have a colormap of None (or a Match error results). For an explanation
+of None, see FreeColormap request. The colormap is copied by sharing the colormap object
+between the child and the parent, not by making a complete copy of the colormap contents.
+      ]]></field>
+      <field name="Cursor"><![CDATA[
+If a cursor is specified, it will be used whenever the pointer is in the window. If None is speci-
+fied, the parent's cursor will be used when the pointer is in the window, and any change in the
+parent's cursor will cause an immediate change in the displayed cursor.
+      ]]></field>
+    </doc>
   </enum>
   
   <enum name="BackPixmap">
@@ -827,6 +1282,79 @@ authorization from the authors.
     <valueparam value-mask-type="CARD32"
                 value-mask-name="value_mask"
                 value-list-name="value_list" />
+    <doc>
+      <brief>Creates a window</brief>
+      <description><![CDATA[
+Creates an unmapped window as child of the specified `parent` window. A
+CreateNotify event will be generated. The new window is placed on top in the
+stacking order with respect to siblings.
+
+The coordinate system has the X axis horizontal and the Y axis vertical with
+the origin [0, 0] at the upper-left corner. Coordinates are integral, in terms
+of pixels, and coincide with pixel centers. Each window and pixmap has its own
+coordinate system. For a window, the origin is inside the border at the inside,
+upper-left corner.
+
+The created window is not yet displayed (mapped), call `xcb_map_window` to
+display it.
+
+The created window will initially use the same cursor as its parent.
+      ]]></description>
+      <field name="wid"><![CDATA[
+The ID with which you will refer to the new window, created by
+`xcb_generate_id`.
+      ]]></field>
+      <field name="depth"><![CDATA[
+Specifies the new window's depth (TODO: what unit?).
+
+The special value `XCB_COPY_FROM_PARENT` means the depth is taken from the
+`parent` window.
+      ]]></field>
+      <field name="visual"><![CDATA[
+Specifies the id for the new window's visual.
+
+The special value `XCB_COPY_FROM_PARENT` means the visual is taken from the
+`parent` window.
+      ]]></field>
+      <field name="class"></field>
+      <field name="parent"><![CDATA[
+The parent window of the new window.
+      ]]></field>
+      <field name="border_width"><![CDATA[
+      TODO:
+
+Must be zero if the `class` is `InputOnly` or a `xcb_match_error_t` occurs.
+      ]]></field>
+      <field name="x"><![CDATA[The X coordinate of the new window.]]></field>
+      <field name="y"><![CDATA[The Y coordinate of the new window.]]></field>
+      <field name="width"><![CDATA[The width of the new window.]]></field>
+      <field name="height"><![CDATA[The height of the new window.]]></field>
+      <error type="Colormap"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Cursor"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Pixmap"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Alloc"><![CDATA[
+The X server could not allocate the requested resources (no memory?).
+      ]]></error>
+      <see type="function" name="xcb_generate_id" />
+      <see type="request" name="MapWindow" />
+      <see type="event" name="CreateNotify" />
+    </doc>
+
   </request>
 
   <request name="ChangeWindowAttributes" opcode="2">
@@ -835,6 +1363,43 @@ authorization from the authors.
     <valueparam value-mask-type="CARD32"
                 value-mask-name="value_mask"
                 value-list-name="value_list" />
+    <doc>
+      <brief>change window attributes</brief>
+      <description><![CDATA[
+Changes the attributes specified by `value_mask` for the specified `window`.
+      ]]></description>
+      <field name="window"><![CDATA[
+The window to change.
+      ]]></field>
+      <!-- the enum documentation is good enough. -->
+      <field name="value_mask" />
+      <field name="value_list"><![CDATA[
+Values for each of the attributes specified in the bitmask `value_mask`. The
+order has to correspond to the order of possible `value_mask` bits. See the
+example.
+      ]]></field>
+      <error type="Access"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Colormap"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Cursor"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Pixmap"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+    </doc>
   </request>
   
   <enum name="MapState">
@@ -863,12 +1428,79 @@ authorization from the authors.
       <field type="CARD32" name="your_event_mask" mask="EventMask" />
       <field type="CARD16" name="do_not_propagate_mask" mask="EventMask" />
       <pad bytes="2" />
+      <doc>
+        <field name="override_redirect"><![CDATA[
+Window managers should ignore this window if `override_redirect` is 1.
+        ]]></field>
+        <field name="visual"><![CDATA[
+The associated visual structure of `window`.
+        ]]></field>
+        <field name="backing_planes"><![CDATA[
+Planes to be preserved if possible.
+        ]]></field>
+        <field name="backing_pixel"><![CDATA[
+Value to be used when restoring planes.
+        ]]></field>
+        <field name="save_under"><![CDATA[
+Boolean, should bits under be saved?
+        ]]></field>
+        <field name="colormap"><![CDATA[
+Color map to be associated with window.
+        ]]></field>
+        <field name="all_event_masks"><![CDATA[
+Set of events all people have interest in.
+        ]]></field>
+        <field name="your_event_mask"><![CDATA[
+My event mask.
+        ]]></field>
+        <field name="do_not_propagate_mask"><![CDATA[
+Set of events that should not propagate.
+        ]]></field>
+        <!-- enum documentation is sufficient for these fields -->
+        <field name="backing_store" />
+        <field name="class" />
+        <field name="bit_gravity" />
+        <field name="win_gravity" />
+        <field name="map_state" />
+      </doc>
     </reply>
+    <doc>
+      <brief>Gets window attributes</brief>
+      <description><![CDATA[
+Gets the current attributes for the specified `window`.
+      ]]></description>
+      <field name="window"><![CDATA[The window to get the attributes from.]]></field>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+      <error type="Drawable"><![CDATA[
+TODO: reasons?
+      ]]></error>
+    </doc>
+
   </request>
 
   <request name="DestroyWindow" opcode="4">
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>Destroys a window</brief>
+      <description><![CDATA[
+Destroys the specified window and all of its subwindows. A DestroyNotify event
+is generated for each destroyed window (a DestroyNotify event is first generated
+for any given window's inferiors). If the window was mapped, it will be
+automatically unmapped before destroying.
+
+Calling DestroyWindow on the root window will do nothing.
+      ]]></description>
+      <field name="window"><![CDATA[The window to destroy.]]></field>
+      <error type="Window"><![CDATA[
+The specified window does not exist.
+      ]]></error>
+      <see type="event" name="DestroyNotify" />
+      <see type="request" name="MapWindow" />
+      <see type="request" name="UnmapWindow" />
+    </doc>
   </request>
 
   <request name="DestroySubwindows" opcode="5">
@@ -884,6 +1516,28 @@ authorization from the authors.
   <request name="ChangeSaveSet" opcode="6">
     <field type="BYTE" name="mode" enum="SetMode" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>Changes a client's save set</brief>
+      <description><![CDATA[
+TODO: explain what the save set is for.
+
+This function either adds or removes the specified window to the client's (your
+application's) save set.
+      ]]></description>
+      <field name="mode"><![CDATA[Insert to add the specified window to the save set or Delete to delete it from the save set.]]></field>
+      <field name="window"><![CDATA[The window to add or delete to/from your save set.]]></field>
+      <error type="Match"><![CDATA[
+You created the specified window. This does not make sense, you can only add
+windows created by other clients to your save set.
+      ]]></error>
+      <error type="Value"><![CDATA[
+You specified an invalid mode.
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified window does not exist.
+      ]]></error>
+      <see type="request" name="ReparentWindow" />
+    </doc>
   </request>
 
   <request name="ReparentWindow" opcode="7">
@@ -892,11 +1546,78 @@ authorization from the authors.
     <field type="WINDOW" name="parent" />
     <field type="INT16" name="x" />
     <field type="INT16" name="y" />
+    <doc>
+      <brief>Reparents a window</brief>
+      <description><![CDATA[
+Makes the specified window a child of the specified parent window. If the
+window is mapped, it will automatically be unmapped before reparenting and
+re-mapped after reparenting. The window is placed in the stacking order on top
+with respect to sibling windows.
+
+After reparenting, a ReparentNotify event is generated.
+      ]]></description>
+      <field name="window"><![CDATA[The window to reparent.]]></field>
+      <field name="parent"><![CDATA[The new parent of the window.]]></field>
+      <field name="x"><![CDATA[
+The X position of the window within its new parent.
+      ]]></field>
+      <field name="y"><![CDATA[
+The Y position of the window within its new parent.
+      ]]></field>
+      <error type="Match"><![CDATA[
+The new parent window is not on the same screen as the old parent window.
+
+The new parent window is the specified window or an inferior of the specified window.
+
+The new parent is InputOnly and the window is not.
+
+The specified window has a ParentRelative background and the new parent window is not the same depth as the specified window.
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified window does not exist.
+      ]]></error>
+      <see type="event" name="ReparentNotify" />
+      <see type="request" name="MapWindow" />
+      <see type="request" name="UnmapWindow" />
+    </doc>
   </request>
 
   <request name="MapWindow" opcode="8">
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>Makes a window visible</brief>
+      <description><![CDATA[
+Maps the specified window. This means making the window visible (as long as its
+parent is visible).
+
+This MapWindow request will be translated to a MapRequest request if a window
+manager is running. The window manager then decides to either map the window or
+not. Set the override-redirect window attribute to true if you want to bypass
+this mechanism.
+
+If the window manager decides to map the window (or if no window manager is
+running), a MapNotify event is generated.
+
+If the window becomes viewable and no earlier contents for it are remembered,
+the X server tiles the window with its background. If the window's background
+is undefined, the existing screen contents are not altered, and the X server
+generates zero or more Expose events.
+
+If the window type is InputOutput, an Expose event will be generated when the
+window becomes visible. The normal response to an Expose event should be to
+repaint the window.
+      ]]></description>
+      <field name="window"><![CDATA[
+The window to make visible.
+]]></field>
+      <error type="Match"><![CDATA[
+The specified window does not exist.
+      ]]></error>
+      <see type="event" name="MapNotify" />
+      <see type="event" name="Expose" />
+      <see type="request" name="UnmapWindow" />
+    </doc>
   </request>
 
   <request name="MapSubwindows" opcode="9">
@@ -907,6 +1628,25 @@ authorization from the authors.
   <request name="UnmapWindow" opcode="10">
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>Makes a window invisible</brief>
+      <description><![CDATA[
+Unmaps the specified window. This means making the window invisible (and all
+its child windows).
+
+Unmapping a window leads to the `UnmapNotify` event being generated. Also,
+`Expose` events are generated for formerly obscured windows.
+      ]]></description>
+      <field name="window"><![CDATA[
+The window to make invisible.
+]]></field>
+      <error type="Window"><![CDATA[
+The specified window does not exist.
+      ]]></error>
+      <see type="event" name="UnmapNotify" />
+      <see type="event" name="Expose" />
+      <see type="request" name="MapWindow" />
+    </doc>
   </request>
 
   <request name="UnmapSubwindows" opcode="11">
@@ -940,6 +1680,55 @@ authorization from the authors.
     <valueparam value-mask-type="CARD16"
                 value-mask-name="value_mask"
                 value-list-name="value_list" />
+    <doc>
+      <brief>Configures window attributes</brief>
+      <description><![CDATA[
+Configures a window's size, position, border width and stacking order.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Configures the given window to the left upper corner
+ * with a size of 1024x768 pixels.
+ *
+ */
+void my_example(xcb_connection *c, xcb_window_t window) {
+    uint16_t mask = 0;
+
+    mask |= XCB_CONFIG_WINDOW_X;
+    mask |= XCB_CONFIG_WINDOW_Y;
+    mask |= XCB_CONFIG_WINDOW_WIDTH;
+    mask |= XCB_CONFIG_WINDOW_HEIGHT;
+
+    const uint32_t values[] = {
+        0,    /* x */
+        0,    /* y */
+        1024, /* width */
+        768   /* height */
+    };
+
+    xcb_configure_window(c, window, mask, values);
+    xcb_flush(c);
+}
+      ]]></example>
+      <field name="window"><![CDATA[The window to configure.]]></field>
+      <field name="value_mask"><![CDATA[Bitmask of attributes to change.]]></field>
+      <field name="value_list"><![CDATA[
+New values, corresponding to the attributes in value_mask. The order has to
+correspond to the order of possible `value_mask` bits. See the example.
+      ]]></field>
+      <error type="Match"><![CDATA[
+You specified a Sibling without also specifying StackMode or the window is not
+actually a Sibling.
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified window does not exist. TODO: any other reason?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <see type="event" name="MapNotify" />
+      <see type="event" name="Expose" />
+    </doc>
   </request>
 
   <enum name="Circulate">
@@ -950,6 +1739,27 @@ authorization from the authors.
   <request name="CirculateWindow" opcode="13">
     <field type="CARD8" name="direction" enum="Circulate" />
     <field type="WINDOW" name="window" />
+    <doc>
+      <brief>Change window stacking order</brief>
+      <description><![CDATA[
+If `direction` is `XCB_CIRCULATE_RAISE_LOWEST`, the lowest mapped child (if
+any) will be raised to the top of the stack.
+
+If `direction` is `XCB_CIRCULATE_LOWER_HIGHEST`, the highest mapped child will
+be lowered to the bottom of the stack.
+      ]]></description>
+      <!-- The enums are documented, we have nothing to add. -->
+      <field name="direction" />
+      <field name="window"><![CDATA[
+The window to raise/lower (depending on `direction`).
+      ]]></field>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+      <error type="Value"><![CDATA[
+The specified `direction` is invalid.
+      ]]></error>
+    </doc>
   </request>
 
   <request name="GetGeometry" opcode="14">
@@ -964,7 +1774,67 @@ authorization from the authors.
       <field type="CARD16" name="height" />
       <field type="CARD16" name="border_width" />
       <pad bytes="2" />
+      <doc>
+      <field name="root"><![CDATA[
+Root window of the screen containing `drawable`.
+      ]]></field>
+      <field name="x"><![CDATA[
+The X coordinate of `drawable`. If `drawable` is a window, the coordinate
+specifies the upper-left outer corner relative to its parent's origin. If
+`drawable` is a pixmap, the X coordinate is always 0.
+      ]]></field>
+      <field name="y"><![CDATA[
+The Y coordinate of `drawable`. If `drawable` is a window, the coordinate
+specifies the upper-left outer corner relative to its parent's origin. If
+`drawable` is a pixmap, the Y coordinate is always 0.
+      ]]></field>
+      <field name="width"><![CDATA[
+The width of `drawable`.
+      ]]></field>
+      <field name="height"><![CDATA[
+The height of `drawable`.
+      ]]></field>
+      <field name="border_width"><![CDATA[
+The border width (in pixels).
+      ]]></field>
+      <field name="depth"><![CDATA[
+The depth of the drawable (bits per pixel for the object).
+      ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>Get current window geometry</brief>
+      <description><![CDATA[
+Gets the current geometry of the specified drawable (either `Window` or `Pixmap`).
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Displays the x and y position of the given window.
+ *
+ */
+void my_example(xcb_connection *c, xcb_window_t window) {
+    xcb_get_geometry_cookie_t cookie;
+    xcb_get_geometry_reply_t *reply;
+
+    cookie = xcb_get_geometry(c, window);
+    /* ... do other work here if possible ... */
+    if ((reply = xcb_get_geometry_reply(c, cookie, NULL))) {
+        printf("This window is at %d, %d\\n", reply->x, reply->y);
+    }
+    free(reply);
+}
+      ]]></example>
+      <field name="drawable"><![CDATA[
+The drawable (`Window` or `Pixmap`) of which the geometry will be received.
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <see type="program" name="xwininfo" />
+    </doc>
   </request>
 
   <request name="QueryTree" opcode="15">
@@ -979,7 +1849,51 @@ authorization from the authors.
       <list type="WINDOW" name="children">
         <fieldref>children_len</fieldref>
       </list>
+      <doc>
+        <field name="root"><![CDATA[
+The root window of `window`.
+        ]]></field>
+        <field name="parent"><![CDATA[
+The parent window of `window`.
+        ]]></field>
+        <field name="children_len"><![CDATA[
+The number of child windows.
+        ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>query the window tree</brief>
+      <description><![CDATA[
+Gets the root window ID, parent window ID and list of children windows for the
+specified `window`. The children are listed in bottom-to-top stacking order.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Displays the root, parent and children of the specified window.
+ *
+ */
+void my_example(xcb_connection *conn, xcb_window_t window) {
+    xcb_query_tree_cookie_t cookie;
+    xcb_query_tree_reply_t *reply;
+
+    cookie = xcb_query_tree(conn, window);
+    if ((reply = xcb_query_tree_reply(conn, cookie, NULL))) {
+        printf("root = 0x%08x\\n", reply->root);
+        printf("parent = 0x%08x\\n", reply->parent);
+
+        xcb_window_t *children = xcb_query_tree_children(reply);
+        for (int i = 0; i < xcb_query_tree_children_length(reply); i++)
+            printf("child window = 0x%08x\\n", children[i]);
+
+        free(reply);
+    }
+}
+      ]]></example>
+      <field name="window"><![CDATA[
+The `window` to query.
+      ]]></field>
+      <see type="program" name="xwininfo" />
+    </doc>
   </request>
 
   <request name="InternAtom" opcode="16">
@@ -993,6 +1907,53 @@ authorization from the authors.
       <pad bytes="1" />
       <field type="ATOM" name="atom" altenum="Atom" />
     </reply>
+    <doc>
+      <brief>Get atom identifier by name</brief>
+      <description><![CDATA[
+Retrieves the identifier (xcb_atom_t TODO) for the atom with the specified
+name. Atoms are used in protocols like EWMH, for example to store window titles
+(`_NET_WM_NAME` atom) as property of a window.
+
+If `only_if_exists` is 0, the atom will be created if it does not already exist.
+If `only_if_exists` is 1, `XCB_ATOM_NONE` will be returned if the atom does
+not yet exist.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Resolves the _NET_WM_NAME atom.
+ *
+ */
+void my_example(xcb_connection *c) {
+    xcb_intern_atom_cookie_t cookie;
+    xcb_intern_atom_reply_t *reply;
+
+    cookie = xcb_intern_atom(c, 0, strlen("_NET_WM_NAME"), "_NET_WM_NAME");
+    /* ... do other work here if possible ... */
+    if ((reply = xcb_intern_atom_reply(c, cookie, NULL))) {
+        printf("The _NET_WM_NAME atom has ID %u\n", reply->atom);
+        free(reply);
+    }
+}
+      ]]></example>
+      <field name="name_len"><![CDATA[
+The length of the following `name`.
+      ]]></field>
+      <field name="name"><![CDATA[
+The name of the atom.
+      ]]></field>
+      <field name="only_if_exists"><![CDATA[
+Return a valid atom id only if the atom already exists.
+      ]]></field>
+      <error type="Alloc"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+A value other than 0 or 1 was specified for `only_if_exists`.
+      ]]></error>
+      <see type="program" name="xlsatoms" />
+      <see type="request" name="GetAtomName" />
+    </doc>
+
   </request>
 
   <request name="GetAtomName" opcode="17">
@@ -1012,6 +1973,21 @@ authorization from the authors.
     <item name="Replace"><value>0</value></item>
     <item name="Prepend"><value>1</value></item>
     <item name="Append"> <value>2</value></item>
+    <doc>
+      <field name="Replace"><![CDATA[
+Discard the previous property value and store the new data.
+      ]]></field>
+      <field name="Prepend"><![CDATA[
+Insert the new data before the beginning of existing data. The `format` must
+match existing property value. If the property is undefined, it is treated as
+defined with the correct type and format with zero-length data.
+      ]]></field>
+      <field name="Append"><![CDATA[
+Insert the new data after the beginning of existing data. The `format` must
+match existing property value. If the property is undefined, it is treated as
+defined with the correct type and format with zero-length data.
+      ]]></field>
+    </doc>
   </enum>
 
   <request name="ChangeProperty" opcode="18">
@@ -1031,6 +2007,71 @@ authorization from the authors.
         <value>8</value>
       </op>
     </list>
+    <doc>
+      <brief>Changes a window property</brief>
+      <description><![CDATA[
+Sets or updates a property on the specified `window`. Properties are for
+example the window title (`WM_NAME`) or its minimum size (`WM_NORMAL_HINTS`).
+Protocols such as EWMH also use properties - for example EWMH defines the
+window title, encoded as UTF-8 string, in the `_NET_WM_NAME` property.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Sets the WM_NAME property of the window to "XCB Example".
+ *
+ */
+void my_example(xcb_connection *conn, xcb_window_t window) {
+    xcb_change_property(conn,
+        XCB_PROP_MODE_REPLACE,
+        window,
+        XCB_ATOM_WM_NAME,
+        XCB_ATOM_STRING,
+        8,
+        strlen("XCB Example"),
+        "XCB Example");
+    xcb_flush(conn);
+}
+      ]]></example>
+      <field name="window"><![CDATA[
+The window whose property you want to change.
+      ]]></field>
+      <!-- the enum doc is sufficient. -->
+      <field name="mode" />
+      <field name="property"><![CDATA[
+The property you want to change (an atom).
+      ]]></field>
+      <field name="type"><![CDATA[
+The type of the property you want to change (an atom).
+      ]]></field>
+      <field name="format"><![CDATA[
+Specifies whether the data should be viewed as a list of 8-bit, 16-bit or
+32-bit quantities. Possible values are 8, 16 and 32. This information allows
+the X server to correctly perform byte-swap operations as necessary.
+      ]]></field>
+      <field name="data_len"><![CDATA[
+Specifies the number of elements (see `format`).
+      ]]></field>
+      <field name="data"><![CDATA[
+The property data.
+      ]]></field>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+      <error type="Atom"><![CDATA[
+`property` or `type` do not refer to a valid atom.
+      ]]></error>
+      <error type="Alloc"><![CDATA[
+The X server could not store the property (no memory?).
+      ]]></error>
+      <see type="request" name="InternAtom" />
+      <see type="program" name="xprop" />
+    </doc>
   </request>
 
   <request name="DeleteProperty" opcode="19">
@@ -1057,15 +2098,110 @@ authorization from the authors.
       <field type="CARD32" name="value_len" />
       <pad bytes="12" />
       <list type="void" name="value">
-	<op op="*">
-	  <fieldref>value_len</fieldref>
-	  <op op="/">
-	    <fieldref>format</fieldref>
-	    <value>8</value>
-	  </op>
-	</op>
+        <op op="*">
+          <fieldref>value_len</fieldref>
+          <op op="/">
+            <fieldref>format</fieldref>
+            <value>8</value>
+          </op>
+        </op>
       </list>
+      <doc>
+      <field name="format"><![CDATA[
+Specifies whether the data should be viewed as a list of 8-bit, 16-bit, or
+32-bit quantities. Possible values are 8, 16, and 32. This information allows
+the X server to correctly perform byte-swap operations as necessary.
+      ]]></field>
+      <field name="type"><![CDATA[
+The actual type of the property (an atom).
+      ]]></field>
+      <field name="bytes_after"><![CDATA[
+The number of bytes remaining to be read in the property if a partial read was
+performed.
+      ]]></field>
+      <field name="value_len"><![CDATA[
+The length of value. You should use the corresponding accessor instead of this
+field.
+      ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>Gets a window property</brief>
+      <description><![CDATA[
+Gets the specified `property` from the specified `window`. Properties are for
+example the window title (`WM_NAME`) or its minimum size (`WM_NORMAL_HINTS`).
+Protocols such as EWMH also use properties - for example EWMH defines the
+window title, encoded as UTF-8 string, in the `_NET_WM_NAME` property.
+
+TODO: talk about `type`
+
+TODO: talk about `delete`
+
+TODO: talk about the offset/length thing. what's a valid use case?
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Prints the WM_NAME property of the window.
+ *
+ */
+void my_example(xcb_connection *c, xcb_window_t window) {
+    xcb_get_property_cookie_t cookie;
+    xcb_get_property_reply_t *reply;
+
+    /* These atoms are predefined in the X11 protocol. */
+    xcb_atom_t property = XCB_ATOM_WM_NAME;
+    xcb_atom_t type = XCB_ATOM_STRING;
+
+    // TODO: a reasonable long_length for WM_NAME?
+    cookie = xcb_get_property(c, 0, window, property, type, 0, 0);
+    if ((reply = xcb_get_property_reply(c, cookie, NULL))) {
+        int len = xcb_get_property_value_length(reply);
+        if (len == 0) {
+            printf("TODO\\n");
+            free(reply);
+            return;
+        }
+        printf("WM_NAME is %.*s\\n", len,
+               (char*)xcb_get_property_value(reply));
+    }
+    free(reply);
+}
+      ]]></example>
+      <field name="window"><![CDATA[
+The window whose property you want to get.
+      ]]></field>
+      <field name="delete"><![CDATA[
+Whether the property should actually be deleted. For deleting a property, the
+specified `type` has to match the actual property type.
+      ]]></field>
+      <field name="property"><![CDATA[
+The property you want to get (an atom).
+      ]]></field>
+      <field name="type"><![CDATA[
+The type of the property you want to get (an atom).
+      ]]></field>
+      <field name="long_offset"><![CDATA[
+Specifies the offset (in 32-bit multiples) in the specified property where the
+data is to be retrieved.
+      ]]></field>
+      <field name="long_length"><![CDATA[
+Specifies how many 32-bit multiples of data should be retrieved (e.g. if you
+set `long_length` to 4, you will receive 16 bytes of data).
+      ]]></field>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+      <error type="Atom"><![CDATA[
+`property` or `type` do not refer to a valid atom.
+      ]]></error>
+      <error type="Value"><![CDATA[
+The specified `long_offset` is beyond the actual property length (e.g. the
+property has a length of 3 bytes and you are setting `long_offset` to 1,
+resulting in a byte offset of 4).
+      ]]></error>
+      <see type="request" name="InternAtom" />
+      <see type="program" name="xprop" />
+    </doc>
   </request>
 
   <request name="ListProperties" opcode="21">
@@ -1086,6 +2222,38 @@ authorization from the authors.
     <field type="WINDOW" name="owner" altenum="Window" />
     <field type="ATOM" name="selection" />
     <field type="TIMESTAMP" name="time" altenum="Time" />
+    <doc>
+      <brief>Sets the owner of a selection</brief>
+      <description><![CDATA[
+Makes `window` the owner of the selection `selection` and updates the
+last-change time of the specified selection.
+
+TODO: briefly explain what a selection is.
+      ]]></description>
+      <field name="selection"><![CDATA[
+The selection.
+      ]]></field>
+      <field name="owner"><![CDATA[
+The new owner of the selection.
+
+The special value `XCB_NONE` means that the selection will have no owner.
+      ]]></field>
+      <field name="time"><![CDATA[
+Timestamp to avoid race conditions when running X over the network.
+
+The selection will not be changed if `time` is earlier than the current
+last-change time of the `selection` or is later than the current X server time.
+Otherwise, the last-change time is set to the specified time.
+
+The special value `XCB_CURRENT_TIME` will be replaced with the current server
+time.
+      ]]></field>
+      <error type="Atom"><![CDATA[
+`selection` does not refer to a valid atom.
+      ]]></error>
+      <see type="request" name="SetSelectionOwner" />
+    </doc>
+
   </request>
 
   <request name="GetSelectionOwner" opcode="23">
@@ -1094,7 +2262,27 @@ authorization from the authors.
     <reply>
       <pad bytes="1" />
       <field type="WINDOW" name="owner" altenum="Window" />
+      <doc>
+        <field name="owner"><![CDATA[
+The current selection owner window.
+        ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>Gets the owner of a selection</brief>
+      <description><![CDATA[
+Gets the owner of the specified selection.
+
+TODO: briefly explain what a selection is.
+      ]]></description>
+      <field name="selection"><![CDATA[
+The selection.
+      ]]></field>
+      <error type="Atom"><![CDATA[
+`selection` does not refer to a valid atom.
+      ]]></error>
+      <see type="request" name="SetSelectionOwner" />
+    </doc>
   </request>
 
   <request name="ConvertSelection" opcode="24">
@@ -1116,11 +2304,97 @@ authorization from the authors.
     <field type="WINDOW" name="destination" altenum="SendEventDest" />
     <field type="CARD32" name="event_mask" mask="EventMask" />
     <list type="char" name="event"><value>32</value></list>
+    <doc>
+      <brief>send an event</brief>
+      <description><![CDATA[
+Identifies the `destination` window, determines which clients should receive
+the specified event and ignores any active grabs.
+
+The `event` must be one of the core events or an event defined by an extension,
+so that the X server can correctly byte-swap the contents as necessary. The
+contents of `event` are otherwise unaltered and unchecked except for the
+`send_event` field which is forced to 'true'.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Tell the given window that it was configured to a size of 800x600 pixels.
+ *
+ */
+void my_example(xcb_connection_t *conn, xcb_window_t window) {
+    /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes.
+     * In order to properly initialize these bytes, we allocate 32 bytes even
+     * though we only need less for an xcb_configure_notify_event_t */
+    xcb_configure_notify_event_t *event = calloc(32, 1);
+
+    event->event = window;
+    event->window = window;
+    event->response_type = XCB_CONFIGURE_NOTIFY;
+
+    event->x = 0;
+    event->y = 0;
+    event->width = 800;
+    event->height = 600;
+
+    event->border_width = 0;
+    event->above_sibling = XCB_NONE;
+    event->override_redirect = false;
+
+    xcb_send_event(conn, false, window, XCB_EVENT_MASK_STRUCTURE_NOTIFY,
+                   (char*)event);
+    xcb_flush(conn);
+    free(event);
+}
+      ]]></example>
+      <field name="destination"><![CDATA[
+The window to send this event to. Every client which selects any event within
+`event_mask` on `destination` will get the event.
+
+The special value `XCB_SEND_EVENT_DEST_POINTER_WINDOW` refers to the window
+that contains the mouse pointer.
+
+The special value `XCB_SEND_EVENT_DEST_ITEM_FOCUS` refers to the window which
+has the keyboard focus.
+      ]]></field>
+      <field name="event_mask"><![CDATA[
+Event_mask for determining which clients should receive the specified event.
+See `destination` and `propagate`.
+      ]]></field>
+      <field name="propagate"><![CDATA[
+If `propagate` is true and no clients have selected any event on `destination`,
+the destination is replaced with the closest ancestor of `destination` for
+which some client has selected a type in `event_mask` and for which no
+intervening window has that type in its do-not-propagate-mask. If no such
+window exists or if the window is an ancestor of the focus window and
+`InputFocus` was originally specified as the destination, the event is not sent
+to any clients. Otherwise, the event is reported to every client selecting on
+the final destination any of the types specified in `event_mask`.
+      ]]></field>
+      <field name="event"><![CDATA[
+The event to send to the specified `destination`.
+      ]]></field>
+      <error type="Window"><![CDATA[
+The specified `destination` window does not exist.
+      ]]></error>
+      <error type="Value"><![CDATA[
+The given `event` is neither a core event nor an event defined by an extension.
+      ]]></error>
+      <see type="event" name="ConfigureNotify" />
+    </doc>
   </request>
 
   <enum name="GrabMode">
     <item name="Sync"> <value>0</value></item>
     <item name="Async"><value>1</value></item>
+    <doc>
+      <field name="Sync"><![CDATA[
+The state of the keyboard appears to freeze: No further keyboard events are
+generated by the server until the grabbing client issues a releasing
+`AllowEvents` request or until the keyboard grab is released.
+      ]]></field>
+      <field name="Async"><![CDATA[
+Keyboard event processing continues normally.
+      ]]></field>
+    </doc>
   </enum>
 
   <enum name="GrabStatus">
@@ -1147,11 +2421,118 @@ authorization from the authors.
     <reply>
       <field type="BYTE" name="status" enum="GrabStatus" />
     </reply>
+    <doc>
+      <brief>Grab the pointer</brief>
+      <description><![CDATA[
+Actively grabs control of the pointer. Further pointer events are reported only to the grabbing client. Overrides any active pointer grab by this client.
+
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Grabs the pointer actively
+ *
+ */
+void my_example(xcb_connection *conn, xcb_screen_t *screen, xcb_cursor_t cursor) {
+    xcb_grab_pointer_cookie_t cookie;
+    xcb_grab_pointer_reply_t *reply;
+
+    cookie = xcb_grab_pointer(
+        conn,
+        false,               /* get all pointer events specified by the following mask */
+        screen->root,        /* grab the root window */
+        XCB_NONE,            /* which events to let through */
+        XCB_GRAB_MODE_ASYNC, /* pointer events should continue as normal */
+        XCB_GRAB_MODE_ASYNC, /* keyboard mode */
+        XCB_NONE,            /* confine_to = in which window should the cursor stay */
+        cursor,              /* we change the cursor to whatever the user wanted */
+        XCB_CURRENT_TIME
+    );
+
+    if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL))) {
+        if (reply->status == XCB_GRAB_STATUS_SUCCESS)
+            printf("successfully grabbed the pointer\\n");
+        free(preply);
+    }
+}
+      ]]></example>
+      <field name="event_mask"><![CDATA[
+Specifies which pointer events are reported to the client.
+
+TODO: which values?
+      ]]></field>
+      <field name="confine_to"><![CDATA[
+Specifies the window to confine the pointer in (the user will not be able to
+move the pointer out of that window).
+
+The special value `XCB_NONE` means don't confine the pointer.
+      ]]></field>
+      <field name="cursor"><![CDATA[
+Specifies the cursor that should be displayed or `XCB_NONE` to not change the
+cursor.
+      ]]></field>
+      <field name="owner_events"><![CDATA[
+If 1, the `grab_window` will still get the pointer events. If 0, events are not
+reported to the `grab_window`.
+      ]]></field>
+      <field name="grab_window"><![CDATA[
+Specifies the window on which the pointer should be grabbed.
+      ]]></field>
+      <field name="time"><![CDATA[
+The time argument allows you to avoid certain circumstances that come up if
+applications take a long time to respond or if there are long network delays.
+Consider a situation where you have two applications, both of which normally
+grab the pointer when clicked on. If both applications specify the timestamp
+from the event, the second application may wake up faster and successfully grab
+the pointer before the first application. The first application then will get
+an indication that the other application grabbed the pointer before its request
+was processed.
+
+The special value `XCB_CURRENT_TIME` will be replaced with the current server
+time.
+      ]]></field>
+      <!-- the enum doc is sufficient. -->
+      <field name="pointer_mode" />
+      <field name="keyboard_mode" />
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+
+      <see type="request" name="GrabKeyboard" />
+    </doc>
   </request>
 
   <request name="UngrabPointer" opcode="27">
     <pad bytes="1" />
     <field type="TIMESTAMP" name="time" altenum="Time" />
+    <doc>
+      <brief>release the pointer</brief>
+      <description><![CDATA[
+Releases the pointer and any queued events if you actively grabbed the pointer
+before using `xcb_grab_pointer`, `xcb_grab_button` or within a normal button
+press.
+
+EnterNotify and LeaveNotify events are generated.
+      ]]></description>
+      <field name="time"><![CDATA[
+Timestamp to avoid race conditions when running X over the network.
+
+The pointer will not be released if `time` is earlier than the
+last-pointer-grab time or later than the current X server time.
+      ]]></field>
+      <field name="name_len"><![CDATA[
+Length (in bytes) of `name`.
+      ]]></field>
+      <field name="name"><![CDATA[
+A pattern describing an X core font.
+      ]]></field>
+      <see type="request" name="GrabPointer" />
+      <see type="request" name="GrabButton" />
+      <see type="event" name="EnterNotify" />
+      <see type="event" name="LeaveNotify" />
+    </doc>
   </request>
 
   <enum name="ButtonIndex">
@@ -1161,6 +2542,26 @@ authorization from the authors.
      <item name="3">  <value>3</value></item>
      <item name="4">  <value>4</value></item>
      <item name="5">  <value>5</value></item>
+    <doc>
+      <field name="Any"><![CDATA[
+Any of the following (or none):
+      ]]></field>
+      <field name="1"><![CDATA[
+The left mouse button.
+      ]]></field>
+      <field name="2"><![CDATA[
+The right mouse button.
+      ]]></field>
+      <field name="3"><![CDATA[
+The middle mouse button.
+      ]]></field>
+      <field name="4"><![CDATA[
+Scroll wheel. TODO: direction?
+      ]]></field>
+      <field name="5"><![CDATA[
+Scroll wheel. TODO: direction?
+      ]]></field>
+    </doc>
   </enum>
 
   <request name="GrabButton" opcode="28">
@@ -1174,6 +2575,92 @@ authorization from the authors.
     <field type="CARD8" name="button" enum="ButtonIndex" />
     <pad bytes="1" />
     <field type="CARD16" name="modifiers" mask="ModMask" />
+    <doc>
+      <brief>Grab pointer button(s)</brief>
+      <description><![CDATA[
+This request establishes a passive grab. The pointer is actively grabbed as
+described in GrabPointer, the last-pointer-grab time is set to the time at
+which the button was pressed (as transmitted in the ButtonPress event), and the
+ButtonPress event is reported if all of the following conditions are true:
+
+The pointer is not grabbed and the specified button is logically pressed when
+the specified modifier keys are logically down, and no other buttons or
+modifier keys are logically down.
+
+The grab-window contains the pointer.
+
+The confine-to window (if any) is viewable.
+
+A passive grab on the same button/key combination does not exist on any
+ancestor of grab-window.
+
+The interpretation of the remaining arguments is the same as for GrabPointer.
+The active grab is terminated automatically when the logical state of the
+pointer has all buttons released, independent of the logical state of modifier
+keys. Note that the logical state of a device (as seen by means of the
+protocol) may lag the physical state if device event processing is frozen. This
+request overrides all previous passive grabs by the same client on the same
+button/key combinations on the same window. A modifier of AnyModifier is
+equivalent to issuing the request for all possible modifier combinations
+(including the combination of no modifiers). It is not required that all
+specified modifiers have currently assigned keycodes. A button of AnyButton is
+equivalent to issuing the request for all possible buttons. Otherwise, it is
+not required that the button specified currently be assigned to a physical
+button.
+
+An Access error is generated if some other client has already issued a
+GrabButton request with the same button/key combination on the same window.
+When using AnyModifier or AnyButton, the request fails completely (no grabs are
+established), and an Access error is generated if there is a conflicting grab
+for any combination. The request has no effect on an active grab.
+
+      ]]></description>
+      <field name="owner_events"><![CDATA[
+If 1, the `grab_window` will still get the pointer events. If 0, events are not
+reported to the `grab_window`.
+      ]]></field>
+      <field name="grab_window"><![CDATA[
+Specifies the window on which the pointer should be grabbed.
+      ]]></field>
+      <field name="event_mask"><![CDATA[
+Specifies which pointer events are reported to the client.
+
+TODO: which values?
+      ]]></field>
+      <field name="confine_to"><![CDATA[
+Specifies the window to confine the pointer in (the user will not be able to
+move the pointer out of that window).
+
+The special value `XCB_NONE` means don't confine the pointer.
+      ]]></field>
+      <field name="cursor"><![CDATA[
+Specifies the cursor that should be displayed or `XCB_NONE` to not change the
+cursor.
+      ]]></field>
+      <field name="modifiers"><![CDATA[
+The modifiers to grab.
+
+Using the special value `XCB_MOD_MASK_ANY` means grab the pointer with all
+possible modifier combinations.
+      ]]></field>
+      <!-- the enum doc is sufficient. -->
+      <field name="pointer_mode" />
+      <field name="keyboard_mode" />
+      <field name="button" />
+      <error type="Access"><![CDATA[
+Another client has already issued a GrabButton with the same button/key
+combination on the same window.
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Cursor"><![CDATA[
+The specified `cursor` does not exist.
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+    </doc>
   </request>
 
   <request name="UngrabButton" opcode="29">
@@ -1201,6 +2688,70 @@ authorization from the authors.
     <reply>
       <field type="BYTE" name="status" enum="GrabStatus" />
     </reply>
+    <doc>
+      <brief>Grab the keyboard</brief>
+      <description><![CDATA[
+Actively grabs control of the keyboard and generates FocusIn and FocusOut
+events. Further key events are reported only to the grabbing client.
+
+Any active keyboard grab by this client is overridden. If the keyboard is
+actively grabbed by some other client, `AlreadyGrabbed` is returned. If
+`grab_window` is not viewable, `GrabNotViewable` is returned. If the keyboard
+is frozen by an active grab of another client, `GrabFrozen` is returned. If the
+specified `time` is earlier than the last-keyboard-grab time or later than the
+current X server time, `GrabInvalidTime` is returned. Otherwise, the
+last-keyboard-grab time is set to the specified time.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Grabs the keyboard actively
+ *
+ */
+void my_example(xcb_connection *conn, xcb_screen_t *screen) {
+    xcb_grab_keyboard_cookie_t cookie;
+    xcb_grab_keyboard_reply_t *reply;
+
+    cookie = xcb_grab_keyboard(
+        conn,
+        true,                /* report events */
+        screen->root,        /* grab the root window */
+        XCB_CURRENT_TIME,
+        XCB_GRAB_MODE_ASYNC, /* process events as normal, do not require sync */
+        XCB_GRAB_MODE_ASYNC
+    );
+
+    if ((reply = xcb_grab_keyboard_reply(conn, cookie, NULL))) {
+        if (reply->status == XCB_GRAB_STATUS_SUCCESS)
+            printf("successfully grabbed the keyboard\\n");
+
+        free(reply);
+    }
+}
+      ]]></example>
+      <field name="owner_events"><![CDATA[
+If 1, the `grab_window` will still get the pointer events. If 0, events are not
+reported to the `grab_window`.
+      ]]></field>
+      <field name="grab_window"><![CDATA[
+Specifies the window on which the pointer should be grabbed.
+      ]]></field>
+      <field name="time"><![CDATA[
+Timestamp to avoid race conditions when running X over the network.
+
+The special value `XCB_CURRENT_TIME` will be replaced with the current server
+time.
+      ]]></field>
+      <!-- the enum doc is sufficient. -->
+      <field name="pointer_mode" />
+      <field name="keyboard_mode" />
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+      <see type="request" name="GrabPointer" />
+    </doc>
   </request>
 
   <request name="UngrabKeyboard" opcode="32">
@@ -1221,6 +2772,78 @@ authorization from the authors.
     <field type="CARD8" name="pointer_mode" enum="GrabMode" />
     <field type="CARD8" name="keyboard_mode" enum="GrabMode" />
     <pad bytes="3" />
+    <doc>
+      <brief>Grab keyboard key(s)</brief>
+      <description><![CDATA[
+Establishes a passive grab on the keyboard. In the future, the keyboard is
+actively grabbed (as for `GrabKeyboard`), the last-keyboard-grab time is set to
+the time at which the key was pressed (as transmitted in the KeyPress event),
+and the KeyPress event is reported if all of the following conditions are true:
+
+The keyboard is not grabbed and the specified key (which can itself be a
+modifier key) is logically pressed when the specified modifier keys are
+logically down, and no other modifier keys are logically down.
+
+Either the grab_window is an ancestor of (or is) the focus window, or the
+grab_window is a descendant of the focus window and contains the pointer.
+
+A passive grab on the same key combination does not exist on any ancestor of
+grab_window.
+
+The interpretation of the remaining arguments is as for XGrabKeyboard.  The active grab is terminated
+automatically when the logical state of the keyboard has the specified key released (independent of the
+logical state of the modifier keys), at which point a KeyRelease event is reported to the grabbing window.
+
+Note that the logical state of a device (as seen by client applications) may lag the physical state if
+device event processing is frozen.
+
+A modifiers argument of AnyModifier is equivalent to issuing the request for all possible modifier combinations (including the combination of no modifiers).  It is not required that all modifiers specified
+have currently assigned KeyCodes.  A keycode argument of AnyKey is equivalent to issuing the request for
+all possible KeyCodes.  Otherwise, the specified keycode must be in the range specified by min_keycode
+and max_keycode in the connection setup, or a BadValue error results.
+
+If some other client has issued a XGrabKey with the same key combination on the same window, a BadAccess
+error results.  When using AnyModifier or AnyKey, the request fails completely, and a BadAccess error
+results (no grabs are established) if there is a conflicting grab for any combination.
+
+      ]]></description>
+      <field name="owner_events"><![CDATA[
+If 1, the `grab_window` will still get the pointer events. If 0, events are not
+reported to the `grab_window`.
+      ]]></field>
+      <field name="grab_window"><![CDATA[
+Specifies the window on which the pointer should be grabbed.
+      ]]></field>
+      <field name="key"><![CDATA[
+The keycode of the key to grab.
+
+The special value `XCB_GRAB_ANY` means grab any key.
+      ]]></field>
+      <field name="cursor"><![CDATA[
+Specifies the cursor that should be displayed or `XCB_NONE` to not change the
+cursor.
+      ]]></field>
+      <field name="modifiers"><![CDATA[
+The modifiers to grab.
+
+Using the special value `XCB_MOD_MASK_ANY` means grab the pointer with all
+possible modifier combinations.
+      ]]></field>
+      <!-- the enum doc is sufficient. -->
+      <field name="pointer_mode" />
+      <field name="keyboard_mode" />
+      <error type="Access"><![CDATA[
+Another client has already issued a GrabKey with the same button/key
+combination on the same window.
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+      <see type="request" name="GrabKeyboard" />
+    </doc>
   </request>
 
   <request name="UngrabKey" opcode="34">
@@ -1228,6 +2851,35 @@ authorization from the authors.
     <field type="WINDOW" name="grab_window" />
     <field type="CARD16" name="modifiers" mask="ModMask" />
     <pad bytes="2" />
+    <doc>
+      <brief>release a key combination</brief>
+      <description><![CDATA[
+Releases the key combination on `grab_window` if you grabbed it using
+`xcb_grab_key` before.
+      ]]></description>
+      <field name="key"><![CDATA[
+The keycode of the specified key combination.
+
+Using the special value `XCB_GRAB_ANY` means releasing all possible key codes.
+      ]]></field>
+      <field name="grab_window"><![CDATA[
+The window on which the grabbed key combination will be released.
+      ]]></field>
+      <field name="modifiers"><![CDATA[
+The modifiers of the specified key combination.
+
+Using the special value `XCB_MOD_MASK_ANY` means releasing the key combination
+with every possible modifier combination.
+      ]]></field>
+      <error type="Window"><![CDATA[
+The specified `grab_window` does not exist.
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <see type="request" name="GrabKey" />
+      <see type="program" name="xev" />
+    </doc>
   </request>
 
   <enum name="Allow">
@@ -1239,11 +2891,106 @@ authorization from the authors.
     <item name="ReplayKeyboard"><value>5</value></item>
     <item name="AsyncBoth">     <value>6</value></item>
     <item name="SyncBoth">      <value>7</value></item>
+    <doc>
+      <field name="AsyncPointer"><![CDATA[
+For AsyncPointer, if the pointer is frozen by the client, pointer event
+processing continues normally. If the pointer is frozen twice by the client on
+behalf of two separate grabs, AsyncPointer thaws for both. AsyncPointer has no
+effect if the pointer is not frozen by the client, but the pointer need not be
+grabbed by the client.
+
+TODO: rewrite this in more understandable terms.
+      ]]></field>
+      <field name="SyncPointer"><![CDATA[
+For SyncPointer, if the pointer is frozen and actively grabbed by the client,
+pointer event processing continues normally until the next ButtonPress or
+ButtonRelease event is reported to the client, at which time the pointer again
+appears to freeze. However, if the reported event causes the pointer grab to be
+released, then the pointer does not freeze. SyncPointer has no effect if the
+pointer is not frozen by the client or if the pointer is not grabbed by the
+client.
+      ]]></field>
+      <field name="ReplayPointer"><![CDATA[
+For ReplayPointer, if the pointer is actively grabbed by the client and is
+frozen as the result of an event having been sent to the client (either from
+the activation of a GrabButton or from a previous AllowEvents with mode
+SyncPointer but not from a GrabPointer), then the pointer grab is released and
+that event is completely reprocessed, this time ignoring any passive grabs at
+or above (towards the root) the grab-window of the grab just released. The
+request has no effect if the pointer is not grabbed by the client or if the
+pointer is not frozen as the result of an event.
+      ]]></field>
+      <field name="AsyncKeyboard"><![CDATA[
+For AsyncKeyboard, if the keyboard is frozen by the client, keyboard event
+processing continues normally. If the keyboard is frozen twice by the client on
+behalf of two separate grabs, AsyncKeyboard thaws for both. AsyncKeyboard has
+no effect if the keyboard is not frozen by the client, but the keyboard need
+not be grabbed by the client.
+      ]]></field>
+      <field name="SyncKeyboard"><![CDATA[
+For SyncKeyboard, if the keyboard is frozen and actively grabbed by the client,
+keyboard event processing continues normally until the next KeyPress or
+KeyRelease event is reported to the client, at which time the keyboard again
+appears to freeze. However, if the reported event causes the keyboard grab to
+be released, then the keyboard does not freeze. SyncKeyboard has no effect if
+the keyboard is not frozen by the client or if the keyboard is not grabbed by
+the client.
+      ]]></field>
+      <field name="ReplayKeyboard"><![CDATA[
+For ReplayKeyboard, if the keyboard is actively grabbed by the client and is
+frozen as the result of an event having been sent to the client (either from
+the activation of a GrabKey or from a previous AllowEvents with mode
+SyncKeyboard but not from a GrabKeyboard), then the keyboard grab is released
+and that event is completely reprocessed, this time ignoring any passive grabs
+at or above (towards the root) the grab-window of the grab just released. The
+request has no effect if the keyboard is not grabbed by the client or if the
+keyboard is not frozen as the result of an event.
+      ]]></field>
+      <field name="SyncBoth"><![CDATA[
+For SyncBoth, if both pointer and keyboard are frozen by the client, event
+processing (for both devices) continues normally until the next ButtonPress,
+ButtonRelease, KeyPress, or KeyRelease event is reported to the client for a
+grabbed device (button event for the pointer, key event for the keyboard), at
+which time the devices again appear to freeze. However, if the reported event
+causes the grab to be released, then the devices do not freeze (but if the
+other device is still grabbed, then a subsequent event for it will still cause
+both devices to freeze). SyncBoth has no effect unless both pointer and
+keyboard are frozen by the client. If the pointer or keyboard is frozen twice
+by the client on behalf of two separate grabs, SyncBoth thaws for both (but a
+subsequent freeze for SyncBoth will only freeze each device once).
+      ]]></field>
+      <field name="AsyncBoth"><![CDATA[
+For AsyncBoth, if the pointer and the keyboard are frozen by the client, event
+processing for both devices continues normally. If a device is frozen twice by
+the client on behalf of two separate grabs, AsyncBoth thaws for both. AsyncBoth
+has no effect unless both pointer and keyboard are frozen by the client.
+      ]]></field>
+    </doc>
   </enum>
 
   <request name="AllowEvents" opcode="35">
     <field type="CARD8" name="mode" enum="Allow" />
     <field type="TIMESTAMP" name="time" altenum="Time" />
+    <doc>
+      <brief>release queued events</brief>
+      <description><![CDATA[
+Releases queued events if the client has caused a device (pointer/keyboard) to
+freeze due to grabbing it actively. This request has no effect if `time` is
+earlier than the last-grab time of the most recent active grab for this client
+or if `time` is later than the current X server time.
+      ]]></description>
+      <!-- the enum doc is sufficient. -->
+      <field name="mode" />
+      <field name="time"><![CDATA[
+Timestamp to avoid race conditions when running X over the network.
+
+The special value `XCB_CURRENT_TIME` will be replaced with the current server
+time.
+      ]]></field>
+      <error type="Value"><![CDATA[
+You specified an invalid `mode`.
+      ]]></error>
+    </doc>
   </request>
 
   <request name="GrabServer" opcode="36" />
@@ -1263,7 +3010,56 @@ authorization from the authors.
       <field type="INT16" name="win_y" />
       <field type="CARD16" name="mask" mask="KeyButMask" />
       <pad bytes="2" />
+      <doc>
+        <field name="same_screen"><![CDATA[
+If `same_screen` is False, then the pointer is not on the same screen as the
+argument window, `child` is None, and `win_x` and `win_y` are zero. If
+`same_screen` is True, then `win_x` and `win_y` are the pointer coordinates
+relative to the argument window's origin, and child is the child containing the
+pointer, if any.
+        ]]></field>
+        <field name="root"><![CDATA[
+The root window the pointer is logically on.
+        ]]></field>
+        <field name="child"><![CDATA[
+The child window containing the pointer, if any, if `same_screen` is true. If
+`same_screen` is false, `XCB_NONE` is returned.
+        ]]></field>
+        <field name="root_x"><![CDATA[
+The pointer X position, relative to `root`.
+        ]]></field>
+        <field name="root_y"><![CDATA[
+The pointer Y position, relative to `root`.
+        ]]></field>
+        <field name="win_x"><![CDATA[
+The pointer X coordinate, relative to `child`, if `same_screen` is true. Zero
+otherwise.
+        ]]></field>
+        <field name="win_y"><![CDATA[
+The pointer Y coordinate, relative to `child`, if `same_screen` is true. Zero
+otherwise.
+        ]]></field>
+        <field name="mask"><![CDATA[
+The current logical state of the modifier keys and the buttons. Note that the
+logical state of a device (as seen by means of the protocol) may lag the
+physical state if device event processing is frozen.
+        ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>get pointer coordinates</brief>
+      <description><![CDATA[
+Gets the root window the pointer is logically on and the pointer coordinates
+relative to the root window's origin.
+      ]]></description>
+      <field name="window"><![CDATA[
+A window to check if the pointer is on the same screen as `window` (see the
+`same_screen` field in the reply).
+      ]]></field>
+      <error type="Window"><![CDATA[
+The specified `window` does not exist.
+      ]]></error>
+    </doc>
   </request>
 
   <struct name="TIMECOORD">
@@ -1311,6 +3107,38 @@ authorization from the authors.
     <field type="CARD16" name="src_height" />
     <field type="INT16" name="dst_x" />
     <field type="INT16" name="dst_y" />
+    <doc>
+      <brief>move mouse pointer</brief>
+      <description><![CDATA[
+Moves the mouse pointer to the specified position.
+
+If `src_window` is not `XCB_NONE` (TODO), the move will only take place if the
+pointer is inside `src_window` and within the rectangle specified by (`src_x`,
+`src_y`, `src_width`, `src_height`). The rectangle coordinates are relative to
+`src_window`.
+
+If `dst_window` is not `XCB_NONE` (TODO), the pointer will be moved to the
+offsets (`dst_x`, `dst_y`) relative to `dst_window`. If `dst_window` is
+`XCB_NONE` (TODO), the pointer will be moved by the offsets (`dst_x`, `dst_y`)
+relative to the current position of the pointer.
+      ]]></description>
+      <field name="src_window"><![CDATA[
+If `src_window` is not `XCB_NONE` (TODO), the move will only take place if the
+pointer is inside `src_window` and within the rectangle specified by (`src_x`,
+`src_y`, `src_width`, `src_height`). The rectangle coordinates are relative to
+`src_window`.
+      ]]></field>
+      <field name="dst_window"><![CDATA[
+If `dst_window` is not `XCB_NONE` (TODO), the pointer will be moved to the
+offsets (`dst_x`, `dst_y`) relative to `dst_window`. If `dst_window` is
+`XCB_NONE` (TODO), the pointer will be moved by the offsets (`dst_x`, `dst_y`)
+relative to the current position of the pointer.
+      ]]></field>
+      <error type="Window"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <see type="request" name="SetInputFocus" />
+    </doc>
   </request>
 
   <!-- used for revert_to and focus -->
@@ -1319,12 +3147,71 @@ authorization from the authors.
     <item name="PointerRoot"><value>1</value></item>
     <item name="Parent">     <value>2</value></item>  <!-- revert_to only -->
     <item name="FollowKeyboard"><value>3</value></item>  <!-- xinput extension only -->
+    <doc>
+      <field name="None"><![CDATA[
+The focus reverts to `XCB_NONE`, so no window will have the input focus.
+      ]]></field>
+      <field name="PointerRoot"><![CDATA[
+The focus reverts to `XCB_POINTER_ROOT` respectively. When the focus reverts,
+FocusIn and FocusOut events are generated, but the last-focus-change time is
+not changed.
+      ]]></field>
+      <field name="Parent"><![CDATA[
+The focus reverts to the parent (or closest viewable ancestor) and the new
+revert_to value is `XCB_INPUT_FOCUS_NONE`.
+      ]]></field>
+      <field name="FollowKeyboard"><![CDATA[
+NOT YET DOCUMENTED. Only relevant for the xinput extension.
+      ]]></field>
+    </doc>
   </enum>
 
   <request name="SetInputFocus" opcode="42">
     <field type="CARD8" name="revert_to" enum="InputFocus" />
     <field type="WINDOW" name="focus" altenum="InputFocus" />
     <field type="TIMESTAMP" name="time" altenum="Time" />
+    <doc>
+      <brief>Sets input focus</brief>
+      <description><![CDATA[
+Changes the input focus and the last-focus-change time. If the specified `time`
+is earlier than the current last-focus-change time, the request is ignored (to
+avoid race conditions when running X over the network).
+
+A FocusIn and FocusOut event is generated when focus is changed.
+      ]]></description>
+      <field name="focus"><![CDATA[
+The window to focus. All keyboard events will be reported to this window. The
+window must be viewable (TODO), or a `xcb_match_error_t` occurs (TODO).
+
+If `focus` is `XCB_NONE` (TODO), all keyboard events are
+discarded until a new focus window is set.
+
+If `focus` is `XCB_POINTER_ROOT` (TODO), focus is on the root window of the
+screen on which the pointer is on currently.
+      ]]></field>
+      <field name="time"><![CDATA[
+Timestamp to avoid race conditions when running X over the network.
+
+The special value `XCB_CURRENT_TIME` will be replaced with the current server
+time.
+      ]]></field>
+      <field name="revert_to"><![CDATA[
+Specifies what happens when the `focus` window becomes unviewable (if `focus`
+is neither `XCB_NONE` nor `XCB_POINTER_ROOT`).
+      ]]></field>
+      <error type="Window"><![CDATA[
+The specified `focus` window does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+The specified `focus` window is not viewable.
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: Reasons?
+      ]]></error>
+      <see type="event" name="FocusIn" />
+      <see type="event" name="FocusOut" />
+    </doc>
+
   </request>
 
   <request name="GetInputFocus" opcode="43">
@@ -1349,6 +3236,28 @@ authorization from the authors.
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
+    <doc>
+      <brief>opens a font</brief>
+      <description><![CDATA[
+Opens any X core font matching the given `name` (for example "-misc-fixed-*").
+
+Note that X core fonts are deprecated (but still supported) in favor of
+client-side rendering using Xft.
+      ]]></description>
+      <field name="fid"><![CDATA[
+The ID with which you will refer to the font, created by `xcb_generate_id`.
+      ]]></field>
+      <field name="name_len"><![CDATA[
+Length (in bytes) of `name`.
+      ]]></field>
+      <field name="name"><![CDATA[
+A pattern describing an X core font.
+      ]]></field>
+      <error type="Name"><![CDATA[
+No font matches the given `name`.
+      ]]></error>
+      <see type="function" name="xcb_generate_id" />
+    </doc>
   </request>
 
   <request name="CloseFont" opcode="46">
@@ -1401,7 +3310,48 @@ authorization from the authors.
       <list type="CHARINFO" name="char_infos">
         <fieldref>char_infos_len</fieldref>
       </list>
+      <doc>
+        <field name="min_bounds"><![CDATA[
+minimum bounds over all existing char
+        ]]></field>
+        <field name="max_bounds"><![CDATA[
+maximum bounds over all existing char
+        ]]></field>
+        <field name="min_char_or_byte2"><![CDATA[
+first character
+        ]]></field>
+        <field name="max_char_or_byte2"><![CDATA[
+last character
+        ]]></field>
+        <field name="default_char"><![CDATA[
+char to print for undefined character
+        ]]></field>
+        <field name="properties_len"><![CDATA[
+how many properties there are
+        ]]></field>
+        <field name="all_chars_exist"><![CDATA[
+flag if all characters have nonzero size
+        ]]></field>
+        <field name="font_ascent"><![CDATA[
+baseline to top edge of raster
+        ]]></field>
+        <field name="font_descent"><![CDATA[
+baseline to bottom edge of raster
+        ]]></field>
+        <!-- enum doc is sufficient -->
+        <field name="draw_direction" />
+      </doc>
     </reply>
+    <doc>
+      <brief>query font metrics</brief>
+      <description><![CDATA[
+Queries information associated with the font.
+      ]]></description>
+      <field name="font"><![CDATA[
+The fontable (Font or Graphics Context) to query.
+      ]]></field>
+      <!-- TODO: example -->
+    </doc>
   </request>
 
   <request name="QueryTextExtents" opcode="48">
@@ -1420,6 +3370,47 @@ authorization from the authors.
       <field type="INT32" name="overall_left" />
       <field type="INT32" name="overall_right" />
     </reply>
+    <doc>
+      <brief>get text extents</brief>
+      <description><![CDATA[
+Query text extents from the X11 server. This request returns the bounding box
+of the specified 16-bit character string in the specified `font` or the font
+contained in the specified graphics context.
+
+`font_ascent` is set to the maximum of the ascent metrics of all characters in
+the string. `font_descent` is set to the maximum of the descent metrics.
+`overall_width` is set to the sum of the character-width metrics of all
+characters in the string. For each character in the string, let W be the sum of
+the character-width metrics of all characters preceding it in the string. Let L
+be the left-side-bearing metric of the character plus W. Let R be the
+right-side-bearing metric of the character plus W. The lbearing member is set
+to the minimum L of all characters in the string. The rbearing member is set to
+the maximum R.
+
+For fonts defined with linear indexing rather than 2-byte matrix indexing, each
+`xcb_char2b_t` structure is interpreted as a 16-bit number with byte1 as the
+most significant byte. If the font has no defined default character, undefined
+characters in the string are taken to have all zero metrics.
+
+Characters with all zero metrics are ignored. If the font has no defined
+default_char, the undefined characters in the string are also ignored.
+      ]]></description>
+      <field name="font"><![CDATA[
+The `font` to calculate text extents in. You can also pass a graphics context.
+      ]]></field>
+      <field name="string_len"><![CDATA[
+The number of characters in `string`.
+      ]]></field>
+      <field name="string"><![CDATA[
+The text to get text extents for.
+      ]]></field>
+      <error type="GC"><![CDATA[
+The specified graphics context does not exist.
+      ]]></error>
+      <error type="Font"><![CDATA[
+The specified `font` does not exist.
+      ]]></error>
+    </doc>
   </request>
 
   <struct name="STR">
@@ -1443,7 +3434,31 @@ authorization from the authors.
       <list type="STR" name="names">
         <fieldref>names_len</fieldref>
       </list>
+      <doc>
+        <field name="names_len"><![CDATA[
+The number of font names.
+        ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>get matching font names</brief>
+      <description><![CDATA[
+Gets a list of available font names which match the given `pattern`.
+      ]]></description>
+      <field name="pattern_len"><![CDATA[
+The length (in bytes) of `pattern`.
+      ]]></field>
+      <field name="pattern"><![CDATA[
+A font pattern, for example "-misc-fixed-*".
+
+The asterisk (*) is a wildcard for any number of characters. The question mark
+(?) is a wildcard for a single character. Use of uppercase or lowercase does
+not matter.
+      ]]></field>
+      <field name="max_names"><![CDATA[
+The maximum number of fonts to be returned.
+      ]]></field>
+    </doc>
   </request>
 
   <request name="ListFontsWithInfo" opcode="50">
@@ -1476,7 +3491,66 @@ authorization from the authors.
       <list type="char" name="name">
         <fieldref>name_len</fieldref>
       </list>
+      <doc>
+        <field name="name_len"><![CDATA[
+The number of matched font names.
+        ]]></field>
+        <field name="min_bounds"><![CDATA[
+minimum bounds over all existing char
+        ]]></field>
+        <field name="max_bounds"><![CDATA[
+maximum bounds over all existing char
+        ]]></field>
+        <field name="min_char_or_byte2"><![CDATA[
+first character
+        ]]></field>
+        <field name="max_char_or_byte2"><![CDATA[
+last character
+        ]]></field>
+        <field name="default_char"><![CDATA[
+char to print for undefined character
+        ]]></field>
+        <field name="properties_len"><![CDATA[
+how many properties there are
+        ]]></field>
+        <field name="all_chars_exist"><![CDATA[
+flag if all characters have nonzero size
+        ]]></field>
+        <field name="font_ascent"><![CDATA[
+baseline to top edge of raster
+        ]]></field>
+        <field name="font_descent"><![CDATA[
+baseline to bottom edge of raster
+        ]]></field>
+        <field name="replies_hint"><![CDATA[
+An indication of how many more fonts will be returned. This is only a hint and
+may be larger or smaller than the number of fonts actually returned. A zero
+value does not guarantee that no more fonts will be returned.
+        ]]></field>
+        <!-- enum doc is sufficient -->
+        <field name="draw_direction" />
+      </doc>
     </reply>
+    <doc>
+      <brief>get matching font names and information</brief>
+      <description><![CDATA[
+Gets a list of available font names which match the given `pattern`.
+      ]]></description>
+      <field name="pattern_len"><![CDATA[
+The length (in bytes) of `pattern`.
+      ]]></field>
+      <field name="pattern"><![CDATA[
+A font pattern, for example "-misc-fixed-*".
+
+The asterisk (*) is a wildcard for any number of characters. The question mark
+(?) is a wildcard for a single character. Use of uppercase or lowercase does
+not matter.
+      ]]></field>
+      <field name="max_names"><![CDATA[
+The maximum number of fonts to be returned.
+      ]]></field>
+    </doc>
+
   </request>
 
   <request name="SetFontPath" opcode="51">
@@ -1505,11 +3579,55 @@ authorization from the authors.
     <field type="DRAWABLE" name="drawable" />
     <field type="CARD16" name="width" />
     <field type="CARD16" name="height" />
+    <doc>
+      <brief>Creates a pixmap</brief>
+      <description><![CDATA[
+Creates a pixmap. The pixmap can only be used on the same screen as `drawable`
+is on and only with drawables of the same `depth`.
+      ]]></description>
+      <field name="depth"><![CDATA[
+TODO
+      ]]></field>
+      <field name="pid"><![CDATA[
+The ID with which you will refer to the new pixmap, created by
+`xcb_generate_id`.
+      ]]></field>
+      <field name="drawable"><![CDATA[
+Drawable to get the screen from.
+      ]]></field>
+      <field name="width"><![CDATA[
+The width of the new pixmap.
+      ]]></field>
+      <field name="height"><![CDATA[
+The height of the new pixmap.
+      ]]></field>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` (Window or Pixmap) does not exist.
+      ]]></error>
+      <error type="Alloc"><![CDATA[
+The X server could not allocate the requested resources (no memory?).
+      ]]></error>
+      <see type="function" name="xcb_generate_id" />
+    </doc>
   </request>
 
   <request name="FreePixmap" opcode="54">
     <pad bytes="1" />
     <field type="PIXMAP" name="pixmap" />
+    <doc>
+      <brief>Destroys a pixmap</brief>
+      <description><![CDATA[
+Deletes the association between the pixmap ID and the pixmap. The pixmap
+storage will be freed when there are no more references to it.
+      ]]></description>
+      <field name="pixmap"><![CDATA[The pixmap to destroy.]]></field>
+      <error type="Pixmap"><![CDATA[
+The specified pixmap does not exist.
+      ]]></error>
+    </doc>
   </request>
   
   <enum name="GC">
@@ -1536,6 +3654,154 @@ authorization from the authors.
     <item name="DashOffset">        <bit>20</bit></item>
     <item name="DashList">          <bit>21</bit></item>
     <item name="ArcMode">           <bit>22</bit></item>
+    <doc>
+      <field name="Function"><![CDATA[
+TODO: Refer to GX
+      ]]></field>
+      <field name="PlaneMask"><![CDATA[
+In graphics operations, given a source and destination pixel, the result is
+computed bitwise on corresponding bits of the pixels; that is, a Boolean
+operation is performed in each bit plane. The plane-mask restricts the
+operation to a subset of planes, so the result is:
+
+        ((src FUNC dst) AND plane-mask) OR (dst AND (NOT plane-mask))
+      ]]></field>
+      <field name="Foreground"><![CDATA[
+Foreground colorpixel.
+      ]]></field>
+      <field name="Background"><![CDATA[
+Background colorpixel.
+      ]]></field>
+      <field name="LineWidth"><![CDATA[
+The line-width is measured in pixels and can be greater than or equal to one, a wide line, or the
+special value zero, a thin line.
+      ]]></field>
+      <field name="LineStyle"><![CDATA[
+The line-style defines which sections of a line are drawn:
+Solid                The full path of the line is drawn.
+DoubleDash           The full path of the line is drawn, but the even dashes are filled differently
+                     than the odd dashes (see fill-style), with Butt cap-style used where even and
+                     odd dashes meet.
+OnOffDash            Only the even dashes are drawn, and cap-style applies to all internal ends of
+                     the individual dashes (except NotLast is treated as Butt).
+      ]]></field>
+      <field name="CapStyle"><![CDATA[
+The cap-style defines how the endpoints of a path are drawn:
+NotLast    The result is equivalent to Butt, except that for a line-width of zero the final
+           endpoint is not drawn.
+Butt       The result is square at the endpoint (perpendicular to the slope of the line)
+           with no projection beyond.
+Round      The result is a circular arc with its diameter equal to the line-width, centered
+           on the endpoint; it is equivalent to Butt for line-width zero.
+Projecting The result is square at the end, but the path continues beyond the endpoint for
+           a distance equal to half the line-width; it is equivalent to Butt for line-width
+           zero.
+      ]]></field>
+      <field name="JoinStyle"><![CDATA[
+The join-style defines how corners are drawn for wide lines:
+Miter               The outer edges of the two lines extend to meet at an angle. However, if the
+                    angle is less than 11 degrees, a Bevel join-style is used instead.
+Round               The result is a circular arc with a diameter equal to the line-width, centered
+                    on the joinpoint.
+Bevel               The result is Butt endpoint styles, and then the triangular notch is filled.
+      ]]></field>
+      <field name="FillStyle"><![CDATA[
+The fill-style defines the contents of the source for line, text, and fill requests. For all text and fill
+requests (for example, PolyText8, PolyText16, PolyFillRectangle, FillPoly, and PolyFillArc)
+as well as for line requests with line-style Solid, (for example, PolyLine, PolySegment,
+PolyRectangle, PolyArc) and for the even dashes for line requests with line-style OnOffDash
+or DoubleDash:
+Solid                     Foreground
+Tiled                     Tile
+OpaqueStippled            A tile with the same width and height as stipple but with background
+                          everywhere stipple has a zero and with foreground everywhere stipple
+                          has a one
+Stippled                  Foreground masked by stipple
+For the odd dashes for line requests with line-style DoubleDash:
+Solid                     Background
+Tiled                     Same as for even dashes
+OpaqueStippled            Same as for even dashes
+Stippled                  Background masked by stipple
+      ]]></field>
+      <field name="FillRule"><![CDATA[
+      ]]></field>
+      <field name="Tile"><![CDATA[
+The tile/stipple represents an infinite two-dimensional plane with the tile/stipple replicated in all
+dimensions. When that plane is superimposed on the drawable for use in a graphics operation,
+the upper-left corner of some instance of the tile/stipple is at the coordinates within the drawable
+specified by the tile/stipple origin. The tile/stipple and clip origins are interpreted relative to the
+origin of whatever destination drawable is specified in a graphics request.
+The tile pixmap must have the same root and depth as the gcontext (or a Match error results).
+The stipple pixmap must have depth one and must have the same root as the gcontext (or a
+Match error results). For fill-style Stippled (but not fill-style
+OpaqueStippled), the stipple pattern is tiled in a single plane and acts as an
+additional clip mask to be ANDed with the clip-mask.
+Any size pixmap can be used for tiling or stippling, although some sizes may be faster to use than
+others.
+      ]]></field>
+      <field name="Stipple"><![CDATA[
+The tile/stipple represents an infinite two-dimensional plane with the tile/stipple replicated in all
+dimensions. When that plane is superimposed on the drawable for use in a graphics operation,
+the upper-left corner of some instance of the tile/stipple is at the coordinates within the drawable
+specified by the tile/stipple origin. The tile/stipple and clip origins are interpreted relative to the
+origin of whatever destination drawable is specified in a graphics request.
+The tile pixmap must have the same root and depth as the gcontext (or a Match error results).
+The stipple pixmap must have depth one and must have the same root as the gcontext (or a
+Match error results). For fill-style Stippled (but not fill-style
+OpaqueStippled), the stipple pattern is tiled in a single plane and acts as an
+additional clip mask to be ANDed with the clip-mask.
+Any size pixmap can be used for tiling or stippling, although some sizes may be faster to use than
+others.
+      ]]></field>
+      <field name="TileStippleOriginX"><![CDATA[
+TODO
+      ]]></field>
+      <field name="TileStippleOriginY"><![CDATA[
+TODO
+      ]]></field>
+      <field name="Font"><![CDATA[
+Which font to use for the `ImageText8` and `ImageText16` requests.
+      ]]></field>
+      <field name="SubwindowMode"><![CDATA[
+For ClipByChildren, both source and destination windows are additionally
+clipped by all viewable InputOutput children. For IncludeInferiors, neither
+source nor destination window is
+clipped by inferiors. This will result in including subwindow contents in the source and drawing
+through subwindow boundaries of the destination. The use of IncludeInferiors with a source or
+destination window of one depth with mapped inferiors of differing depth is not illegal, but the
+semantics is undefined by the core protocol.
+      ]]></field>
+      <field name="GraphicsExposures"><![CDATA[
+Whether ExposureEvents should be generated (1) or not (0).
+
+The default is 1.
+      ]]></field>
+      <field name="ClipOriginX"><![CDATA[
+TODO
+      ]]></field>
+      <field name="ClipOriginY"><![CDATA[
+TODO
+      ]]></field>
+      <field name="ClipMask"><![CDATA[
+The clip-mask restricts writes to the destination drawable. Only pixels where the clip-mask has
+bits set to 1 are drawn. Pixels are not drawn outside the area covered by the clip-mask or where
+the clip-mask has bits set to 0. The clip-mask affects all graphics requests, but it does not clip
+sources. The clip-mask origin is interpreted relative to the origin of whatever destination drawable is specified in a graphics request. If a pixmap is specified as the clip-mask, it must have
+depth 1 and have the same root as the gcontext (or a Match error results). If clip-mask is None,
+then pixels are always drawn, regardless of the clip origin. The clip-mask can also be set with the
+SetClipRectangles request.
+      ]]></field>
+      <field name="DashOffset"><![CDATA[
+TODO
+      ]]></field>
+      <field name="DashList"><![CDATA[
+TODO
+      ]]></field>
+      <field name="ArcMode"><![CDATA[
+TODO
+      ]]></field>
+    </doc>
+
   </enum>
 
   <!-- GC Function values -->
@@ -1606,6 +3872,39 @@ authorization from the authors.
     <valueparam value-mask-type="CARD32"
                 value-mask-name="value_mask"
                 value-list-name="value_list" />
+    <doc>
+      <brief>Creates a graphics context</brief>
+      <description><![CDATA[
+Creates a graphics context. The graphics context can be used with any drawable
+that has the same root and depth as the specified drawable.
+      ]]></description>
+      <field name="cid"><![CDATA[
+The ID with which you will refer to the graphics context, created by
+`xcb_generate_id`.
+      ]]></field>
+      <field name="drawable"><![CDATA[
+Drawable to get the root/depth from.
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` (Window or Pixmap) does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Font"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Pixmap"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Alloc"><![CDATA[
+The X server could not allocate the requested resources (no memory?).
+      ]]></error>
+      <see type="function" name="xcb_generate_id" />
+    </doc>
   </request>
 
   <request name="ChangeGC" opcode="56">
@@ -1614,6 +3913,62 @@ authorization from the authors.
     <valueparam value-mask-type="CARD32"
                 value-mask-name="value_mask"
                 value-list-name="value_list" />
+    <doc>
+      <brief>change graphics context components</brief>
+      <description><![CDATA[
+Changes the components specified by `value_mask` for the specified graphics context.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Changes the foreground color component of the specified graphics context.
+ *
+ */
+void my_example(xcb_connection *conn, xcb_gcontext_t gc, uint32_t fg, uint32_t bg) {
+    /* C99 allows us to use a compact way of changing a single component: */
+    xcb_change_gc(conn, gc, XCB_GC_FOREGROUND, (uint32_t[]){ fg });
+
+    /* The more explicit way. Beware that the order of values is important! */
+    uint32_t mask = 0;
+    mask |= XCB_GC_FOREGROUND;
+    mask |= XCB_GC_BACKGROUND;
+
+    uint32_t values[] = {
+        fg,
+        bg
+    };
+    xcb_change_gc(conn, gc, mask, values);
+    xcb_flush(conn);
+}
+      ]]></example>
+      <field name="gc"><![CDATA[
+The graphics context to change.
+      ]]></field>
+      <!-- the enum documentation is good enough. -->
+      <field name="value_mask" />
+      <field name="value_list"><![CDATA[
+Values for each of the components specified in the bitmask `value_mask`. The
+order has to correspond to the order of possible `value_mask` bits. See the
+example.
+      ]]></field>
+      <error type="Font"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="GC"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Pixmap"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Alloc"><![CDATA[
+The X server could not allocate the requested resources (no memory?).
+      ]]></error>
+    </doc>
   </request>
 
   <request name="CopyGC" opcode="57">
@@ -1651,6 +4006,16 @@ authorization from the authors.
   <request name="FreeGC" opcode="60">
     <pad bytes="1" />
     <field type="GCONTEXT" name="gc" />
+    <doc>
+      <brief>Destroys a graphics context</brief>
+      <description><![CDATA[
+Destroys the specified `gc` and all associated storage.
+      ]]></description>
+      <field name="gc"><![CDATA[The graphics context to destroy.]]></field>
+      <error type="GC"><![CDATA[
+The specified graphics context does not exist.
+      ]]></error>
+    </doc>
   </request>
 
   <request name="ClearArea" opcode="61">
@@ -1673,6 +4038,48 @@ authorization from the authors.
     <field type="INT16" name="dst_y" />
     <field type="CARD16" name="width" />
     <field type="CARD16" name="height" />
+    <doc>
+      <brief>copy areas</brief>
+      <description><![CDATA[
+Copies the specified rectangle from `src_drawable` to `dst_drawable`.
+      ]]></description>
+      <field name="dst_drawable"><![CDATA[
+The destination drawable (Window or Pixmap).
+      ]]></field>
+      <field name="src_drawable"><![CDATA[
+The source drawable (Window or Pixmap).
+      ]]></field>
+      <field name="gc"><![CDATA[
+The graphics context to use.
+      ]]></field>
+      <field name="src_x"><![CDATA[
+The source X coordinate.
+      ]]></field>
+      <field name="src_y"><![CDATA[
+The source Y coordinate.
+      ]]></field>
+      <field name="dst_x"><![CDATA[
+The destination X coordinate.
+      ]]></field>
+      <field name="dst_y"><![CDATA[
+The destination Y coordinate.
+      ]]></field>
+      <field name="width"><![CDATA[
+The width of the area to copy (in pixels).
+      ]]></field>
+      <field name="height"><![CDATA[
+The height of the area to copy (in pixels).
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` (Window or Pixmap) does not exist.
+      ]]></error>
+      <error type="GC"><![CDATA[
+The specified graphics context does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+`src_drawable` has a different root or depth than `dst_drawable`.
+      ]]></error>
+    </doc>
   </request>
 
   <request name="CopyPlane" opcode="63">
@@ -1692,6 +4099,14 @@ authorization from the authors.
   <enum name="CoordMode">
     <item name="Origin">  <value>0</value></item>
     <item name="Previous"><value>1</value></item>
+    <doc>
+      <field name="Origin"><![CDATA[
+Treats all coordinates as relative to the origin.
+      ]]></field>
+      <field name="Previous"><![CDATA[
+Treats all coordinates after the first as relative to the previous coordinate.
+      ]]></field>
+    </doc>
   </enum>
 
   <!-- combine-adjacent doesn't work for mode==Relative -->
@@ -1707,6 +4122,56 @@ authorization from the authors.
     <field type="DRAWABLE" name="drawable" />
     <field type="GCONTEXT" name="gc" />
     <list type="POINT" name="points" />
+    <doc>
+      <brief>draw lines</brief>
+      <description><![CDATA[
+Draws `points_len`-1 lines between each pair of points (point[i], point[i+1])
+in the `points` array. The lines are drawn in the order listed in the array.
+They join correctly at all intermediate points, and if the first and last
+points coincide, the first and last lines also join correctly. For any given
+line, a pixel is not drawn more than once. If thin (zero line-width) lines
+intersect, the intersecting pixels are drawn multiple times. If wide lines
+intersect, the intersecting pixels are drawn only once, as though the entire
+request were a single, filled shape.
+      ]]></description>
+      <example><![CDATA[
+/*
+ * Draw a straight line.
+ *
+ */
+void my_example(xcb_connection *conn, xcb_drawable_t drawable, xcb_gcontext_t gc) {
+    xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, drawable, gc, 2,
+                  (xcb_point_t[]) { {10, 10}, {100, 10} });
+    xcb_flush(conn);
+}
+      ]]></example>
+      <field name="drawable"><![CDATA[
+The drawable to draw the line(s) on.
+      ]]></field>
+      <field name="gc"><![CDATA[
+The graphics context to use.
+      ]]></field>
+      <field name="points_len"><![CDATA[
+The number of `xcb_point_t` structures in `points`.
+      ]]></field>
+      <field name="points"><![CDATA[
+An array of points.
+      ]]></field>
+      <!-- the enum doc is sufficient. -->
+      <field name="coordinate_mode" />
+      <error type="Drawable"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="GC"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <error type="Value"><![CDATA[
+TODO: reasons?
+      ]]></error>
+    </doc>
   </request>
 
   <struct name="SEGMENT">
@@ -1721,6 +4186,43 @@ authorization from the authors.
     <field type="DRAWABLE" name="drawable" />
     <field type="GCONTEXT" name="gc" />
     <list type="SEGMENT" name="segments" />
+    <doc>
+      <brief>draw lines</brief>
+      <description><![CDATA[
+Draws multiple, unconnected lines. For each segment, a line is drawn between
+(x1, y1) and (x2, y2). The lines are drawn in the order listed in the array of
+`xcb_segment_t` structures and does not perform joining at coincident
+endpoints. For any given line, a pixel is not drawn more than once. If lines
+intersect, the intersecting pixels are drawn multiple times.
+
+TODO: include the xcb_segment_t data structure
+
+TODO: an example
+      ]]></description>
+      <field name="drawable"><![CDATA[
+A drawable (Window or Pixmap) to draw on.
+      ]]></field>
+      <field name="gc"><![CDATA[
+The graphics context to use.
+
+TODO: document which attributes of a gc are used
+      ]]></field>
+      <field name="segments_len"><![CDATA[
+The number of `xcb_segment_t` structures in `segments`.
+      ]]></field>
+      <field name="segments"><![CDATA[
+An array of `xcb_segment_t` structures.
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` does not exist.
+      ]]></error>
+      <error type="GC"><![CDATA[
+The specified `gc` does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+    </doc>
   </request>
 
   <request name="PolyRectangle" opcode="67" combine-adjacent="true">
@@ -1763,6 +4265,42 @@ authorization from the authors.
     <field type="DRAWABLE" name="drawable" />
     <field type="GCONTEXT" name="gc" />
     <list type="RECTANGLE" name="rectangles" />
+    <doc>
+      <brief>Fills rectangles</brief>
+      <description><![CDATA[
+Fills the specified rectangle(s) in the order listed in the array. For any
+given rectangle, each pixel is not drawn more than once. If rectangles
+intersect, the intersecting pixels are drawn multiple times.
+      ]]></description>
+      <field name="drawable"><![CDATA[
+The drawable (Window or Pixmap) to draw on.
+      ]]></field>
+      <field name="gc"><![CDATA[
+The graphics context to use.
+
+The following graphics context components are used: function, plane-mask,
+fill-style, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
+
+The following graphics context mode-dependent components are used:
+foreground, background, tile, stipple, tile-stipple-x-origin, and
+tile-stipple-y-origin.
+      ]]></field>
+      <field name="rectangles_len"><![CDATA[
+The number of `xcb_rectangle_t` structures in `rectangles`.
+      ]]></field>
+      <field name="rectangles"><![CDATA[
+The rectangles to fill.
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` (Window or Pixmap) does not exist.
+      ]]></error>
+      <error type="GC"><![CDATA[
+The specified graphics context does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+    </doc>
   </request>
 
   <request name="PolyFillArc" opcode="71" combine-adjacent="true">
@@ -1841,6 +4379,52 @@ authorization from the authors.
     <list type="char" name="string">
       <fieldref>string_len</fieldref>
     </list>
+    <doc>
+      <brief>Draws text</brief>
+      <description><![CDATA[
+Fills the destination rectangle with the background pixel from `gc`, then
+paints the text with the foreground pixel from `gc`. The upper-left corner of
+the filled rectangle is at [x, y - font-ascent]. The width is overall-width,
+the height is font-ascent + font-descent. The overall-width, font-ascent and
+font-descent are as returned by `xcb_query_text_extents` (TODO).
+
+Note that using X core fonts is deprecated (but still supported) in favor of
+client-side rendering using Xft.
+      ]]></description>
+      <field name="drawable"><![CDATA[
+The drawable (Window or Pixmap) to draw text on.
+      ]]></field>
+      <field name="string_len"><![CDATA[
+The length of the `string`. Note that this parameter limited by 255 due to
+using 8 bits!
+      ]]></field>
+      <field name="string"><![CDATA[
+The string to draw. Only the first 255 characters are relevant due to the data
+type of `string_len`.
+      ]]></field>
+      <field name="x"><![CDATA[
+The x coordinate of the first character, relative to the origin of `drawable`.
+      ]]></field>
+      <field name="y"><![CDATA[
+The y coordinate of the first character, relative to the origin of `drawable`.
+      ]]></field>
+      <field name="gc"><![CDATA[
+The graphics context to use.
+
+The following graphics context components are used: plane-mask, foreground,
+background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` (Window or Pixmap) does not exist.
+      ]]></error>
+      <error type="GC"><![CDATA[
+The specified graphics context does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <see type="request" name="ImageText16" />
+    </doc>
   </request>
 
   <request name="ImageText16" opcode="77">
@@ -1852,6 +4436,53 @@ authorization from the authors.
     <list type="CHAR2B" name="string">
       <fieldref>string_len</fieldref>
     </list>
+    <doc>
+      <brief>Draws text</brief>
+      <description><![CDATA[
+Fills the destination rectangle with the background pixel from `gc`, then
+paints the text with the foreground pixel from `gc`. The upper-left corner of
+the filled rectangle is at [x, y - font-ascent]. The width is overall-width,
+the height is font-ascent + font-descent. The overall-width, font-ascent and
+font-descent are as returned by `xcb_query_text_extents` (TODO).
+
+Note that using X core fonts is deprecated (but still supported) in favor of
+client-side rendering using Xft.
+      ]]></description>
+      <field name="drawable"><![CDATA[
+The drawable (Window or Pixmap) to draw text on.
+      ]]></field>
+      <field name="string_len"><![CDATA[
+The length of the `string` in characters. Note that this parameter limited by
+255 due to using 8 bits!
+      ]]></field>
+      <field name="string"><![CDATA[
+The string to draw. Only the first 255 characters are relevant due to the data
+type of `string_len`. Every character uses 2 bytes (hence the 16 in this
+request's name).
+      ]]></field>
+      <field name="x"><![CDATA[
+The x coordinate of the first character, relative to the origin of `drawable`.
+      ]]></field>
+      <field name="y"><![CDATA[
+The y coordinate of the first character, relative to the origin of `drawable`.
+      ]]></field>
+      <field name="gc"><![CDATA[
+The graphics context to use.
+
+The following graphics context components are used: plane-mask, foreground,
+background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
+      ]]></field>
+      <error type="Drawable"><![CDATA[
+The specified `drawable` (Window or Pixmap) does not exist.
+      ]]></error>
+      <error type="GC"><![CDATA[
+The specified graphics context does not exist.
+      ]]></error>
+      <error type="Match"><![CDATA[
+TODO: reasons?
+      ]]></error>
+      <see type="request" name="ImageText8" />
+    </doc>
   </request>
 
   <enum name= "ColormapAlloc">
@@ -1915,6 +4546,31 @@ authorization from the authors.
       <pad bytes="2" />
       <field type="CARD32" name="pixel" />
     </reply>
+    <doc>
+      <brief>Allocate a color</brief>
+      <description><![CDATA[
+Allocates a read-only colormap entry corresponding to the closest RGB value
+supported by the hardware. If you are using TrueColor, you can take a shortcut
+and directly calculate the color pixel value to avoid the round trip. But, for
+example, on 16-bit color setups (VNC), you can easily get the closest supported
+RGB value to the RGB value you are specifying.
+      ]]></description>
+      <field name="cmap"><![CDATA[
+TODO
+      ]]></field>
+      <field name="red"><![CDATA[
+The red value of your color.
+      ]]></field>
+      <field name="green"><![CDATA[
+The green value of your color.
+      ]]></field>
+      <field name="blue"><![CDATA[
+The blue value of your color.
+      ]]></field>
+      <error type="Colormap"><![CDATA[
+The specified colormap `cmap` does not exist.
+      ]]></error>
+    </doc>
   </request>
 
   <request name="AllocNamedColor" opcode="85">
@@ -2092,11 +4748,82 @@ authorization from the authors.
     <field type="CARD16" name="back_red" />
     <field type="CARD16" name="back_green" />
     <field type="CARD16" name="back_blue" />
+    <doc>
+      <brief>create cursor</brief>
+      <description><![CDATA[
+Creates a cursor from a font glyph. X provides a set of standard cursor shapes
+in a special font named cursor. Applications are encouraged to use this
+interface for their cursors because the font can be customized for the
+individual display type.
+
+All pixels which are set to 1 in the source will use the foreground color (as
+specified by `fore_red`, `fore_green` and `fore_blue`). All pixels set to 0
+will use the background color (as specified by `back_red`, `back_green` and
+`back_blue`).
+      ]]></description>
+      <field name="cid"><![CDATA[
+The ID with which you will refer to the cursor, created by `xcb_generate_id`.
+      ]]></field>
+      <field name="source_font"><![CDATA[
+In which font to look for the cursor glyph.
+      ]]></field>
+      <field name="mask_font"><![CDATA[
+In which font to look for the mask glyph.
+      ]]></field>
+      <field name="source_char"><![CDATA[
+The glyph of `source_font` to use.
+      ]]></field>
+      <field name="mask_char"><![CDATA[
+The glyph of `mask_font` to use as a mask: Pixels which are set to 1 define
+which source pixels are displayed. All pixels which are set to 0 are not
+displayed.
+      ]]></field>
+      <field name="fore_red"><![CDATA[
+The red value of the foreground color.
+      ]]></field>
+      <field name="fore_green"><![CDATA[
+The green value of the foreground color.
+      ]]></field>
+      <field name="fore_blue"><![CDATA[
+The blue value of the foreground color.
+      ]]></field>
+      <field name="back_red"><![CDATA[
+The red value of the background color.
+      ]]></field>
+      <field name="back_green"><![CDATA[
+The green value of the background color.
+      ]]></field>
+      <field name="back_blue"><![CDATA[
+The blue value of the background color.
+      ]]></field>
+      <error type="Alloc"><![CDATA[
+The X server could not allocate the requested resources (no memory?).
+      ]]></error>
+      <error type="Font"><![CDATA[
+The specified `source_font` or `mask_font` does not exist.
+      ]]></error>
+      <error type="Value"><![CDATA[
+Either `source_char` or `mask_char` are not defined in `source_font` or `mask_font`, respectively.
+      ]]></error>
+      <!-- TODO: example -->
+    </doc>
   </request>
 
   <request name="FreeCursor" opcode="95">
     <pad bytes="1" />
     <field type="CURSOR" name="cursor" />
+    <doc>
+      <brief>Deletes a cursor</brief>
+      <description><![CDATA[
+Deletes the association between the cursor resource ID and the specified
+cursor. The cursor is freed when no other resource references it.
+      ]]></description>
+      <field name="cursor"><![CDATA[The cursor to destroy.]]></field>
+      <error type="Cursor"><![CDATA[
+The specified cursor does not exist.
+      ]]></error>
+    </doc>
+
   </request>
 
   <request name="RecolorCursor" opcode="96">
@@ -2141,7 +4868,44 @@ authorization from the authors.
       <field type="CARD8" name="major_opcode" />
       <field type="CARD8" name="first_event" />
       <field type="CARD8" name="first_error" />
+      <doc>
+        <field name="present"><![CDATA[
+Whether the extension is present on this X11 server.
+        ]]></field>
+        <field name="major_opcode"><![CDATA[
+The major opcode for requests.
+        ]]></field>
+        <field name="first_event"><![CDATA[
+The first event code, if any.
+        ]]></field>
+        <field name="first_error"><![CDATA[
+The first error code, if any.
+        ]]></field>
+      </doc>
     </reply>
+    <doc>
+      <brief>check if extension is present</brief>
+      <description><![CDATA[
+Determines if the specified extension is present on this X11 server.
+
+Every extension has a unique `major_opcode` to identify requests, the minor
+opcodes and request formats are extension-specific. If the extension provides
+events and errors, the `first_event` and `first_error` fields in the reply are
+set accordingly.
+
+There should rarely be a need to use this request directly, XCB provides the
+`xcb_get_extension_data` function instead.
+      ]]></description>
+      <field name="name_len"><![CDATA[
+The length of `name` in bytes.
+      ]]></field>
+      <field name="name"><![CDATA[
+The name of the extension to query, for example "RANDR". This is case
+sensitive!
+      ]]></field>
+      <see type="program" name="xdpyinfo" />
+      <see type="function" name="xcb_get_extension_data" />
+    </doc>
   </request>
 
   <request name="ListExtensions" opcode="99">
@@ -2349,6 +5113,24 @@ authorization from the authors.
   <request name="KillClient" opcode="113">
     <pad bytes="1" />
     <field type="CARD32" name="resource" altenum="Kill" />
+    <doc>
+      <brief>kills a client</brief>
+      <description><![CDATA[
+Forces a close down of the client that created the specified `resource`.
+      ]]></description>
+      <field name="resource"><![CDATA[
+Any resource belonging to the client (for example a Window), used to identify
+the client connection.
+
+The special value of `XCB_KILL_ALL_TEMPORARY`, the resources of all clients
+that have terminated in `RetainTemporary` (TODO) are destroyed.
+      ]]></field>
+      <error type="Value"><![CDATA[
+The specified `resource` does not exist.
+      ]]></error>
+      <see type="program" name="xkill" />
+    </doc>
+
   </request>
 
   <request name="RotateProperties" opcode="114">
diff --git a/libxcb/xcb-proto/xcbgen/expr.py b/libxcb/xcb-proto/xcbgen/expr.py
index bbc5a3fd7..4f8af6f83 100644
--- a/libxcb/xcb-proto/xcbgen/expr.py
+++ b/libxcb/xcb-proto/xcbgen/expr.py
@@ -1,127 +1,129 @@
-'''

-This module contains helper classes for structure fields and length expressions.

-'''

-class Field(object):

-    '''

-    Represents a field of a structure.

-

-    type is the datatype object for the field.

-    field_type is the name of the type (string tuple)

-    field_name is the name of the structure field.

-    visible is true iff the field should be in the request API.

-    wire is true iff the field should be in the request structure.

-    auto is true iff the field is on the wire but not in the request API (e.g. opcode)

-    '''

-    def __init__(self, type, field_type, field_name, visible, wire, auto):

-        self.type = type

-        self.field_type = field_type

-        self.field_name = field_name

-        self.visible = visible

-        self.wire = wire

-        self.auto = auto

-

-

-class Expression(object):

-    '''

-    Represents a mathematical expression for a list length or exprfield.

-

-    Public fields:

-    op is the operation (text +,*,/,<<,~) or None.

-    lhs and rhs are the sub-Expressions if op is set.

-    lenfield_name is the name of the length field, or None for request lists.

-    lenfield is the Field object for the length field, or None.

-    bitfield is True if the length field is a bitmask instead of a number.

-    nmemb is the fixed size (value)of the expression, or None

-    '''

-    def __init__(self, elt, parent):

-        self.parent = parent

-

-        self.nmemb = None

-

-        self.lenfield_name = None

-        self.lenfield_type = None

-        self.lenfield_parent = None

-        self.lenfield = None

-        self.lenwire = False

-        self.bitfield = False

-

-        self.op = None

-        self.lhs = None

-        self.rhs = None

-

-        if elt.tag == 'list':

-            # List going into a request, which has no length field (inferred by server)

-            self.lenfield_name = elt.get('name') + '_len'

-            self.lenfield_type = 'CARD32'

-

-        elif elt.tag == 'fieldref':

-            # Standard list with a fieldref

-            self.lenfield_name = elt.text

-

-        elif elt.tag == 'valueparam':

-            # Value-mask.  The length bitmask is described by attributes.

-            self.lenfield_name = elt.get('value-mask-name')

-            self.lenfield_type = elt.get('value-mask-type')

-            self.lenwire = True

-            self.bitfield = True

-

-        elif elt.tag == 'op':

-            # Op field.  Need to recurse.

-            self.op = elt.get('op')

-            self.lhs = Expression(list(elt)[0], parent)

-            self.rhs = Expression(list(elt)[1], parent)

-

-            # Hopefully we don't have two separate length fields...

-            self.lenfield_name = self.lhs.lenfield_name

-            if self.lenfield_name == None:

-                self.lenfield_name = self.rhs.lenfield_name

-

-        elif elt.tag == 'unop':

-            # Op field.  Need to recurse.

-            self.op = elt.get('op')

-            self.rhs = Expression(list(elt)[0], parent)

-

-            self.lenfield_name = self.rhs.lenfield_name

-            

-        elif elt.tag == 'value':

-            # Constant expression

-            self.nmemb = int(elt.text, 0)

-

-        elif elt.tag == 'popcount':

-            self.op = 'popcount'

-            self.rhs = Expression(list(elt)[0], parent)

-            self.lenfield_name = self.rhs.lenfield_name

-            # xcb_popcount returns 'int' - handle the type in the language-specific part

-

-        elif elt.tag == 'enumref':

-            self.op = 'enumref'

-            self.lenfield_name = (elt.get('ref'), elt.text)

-            

-        elif elt.tag == 'sumof':

-            self.op = 'sumof'

-            self.lenfield_name = elt.get('ref')

-

-        else:

-            # Notreached

-            raise Exception("undefined tag '%s'" % elt.tag)

-

-    def fixed_size(self):

-        return self.nmemb != None

-

-    def resolve(self, module, parents):

-        if self.op == 'enumref':

-            self.lenfield_type = module.get_type(self.lenfield_name[0])

-            self.lenfield_name = self.lenfield_name[1]

-        elif self.op == 'sumof':

-            # need to find the field with lenfield_name

-            for p in reversed(parents): 

-                fields = dict([(f.field_name, f) for f in p.fields])

-                if self.lenfield_name in fields.keys():

-                    if p.is_bitcase:

-                        # switch is the anchestor 

-                        self.lenfield_parent = p.parents[-1]

-                    else:

-                        self.lenfield_parent = p

-                    self.lenfield_type = fields[self.lenfield_name].field_type

-                    break

-                    

+'''
+This module contains helper classes for structure fields and length expressions.
+'''
+class Field(object):
+    '''
+    Represents a field of a structure.
+
+    type is the datatype object for the field.
+    field_type is the name of the type (string tuple)
+    field_name is the name of the structure field.
+    visible is true iff the field should be in the request API.
+    wire is true iff the field should be in the request structure.
+    auto is true iff the field is on the wire but not in the request API (e.g. opcode)
+    enum is the enum name this field refers to, if any.
+    '''
+    def __init__(self, type, field_type, field_name, visible, wire, auto, enum=None):
+        self.type = type
+        self.field_type = field_type
+        self.field_name = field_name
+        self.enum = enum
+        self.visible = visible
+        self.wire = wire
+        self.auto = auto
+
+
+class Expression(object):
+    '''
+    Represents a mathematical expression for a list length or exprfield.
+
+    Public fields:
+    op is the operation (text +,*,/,<<,~) or None.
+    lhs and rhs are the sub-Expressions if op is set.
+    lenfield_name is the name of the length field, or None for request lists.
+    lenfield is the Field object for the length field, or None.
+    bitfield is True if the length field is a bitmask instead of a number.
+    nmemb is the fixed size (value)of the expression, or None
+    '''
+    def __init__(self, elt, parent):
+        self.parent = parent
+
+        self.nmemb = None
+
+        self.lenfield_name = None
+        self.lenfield_type = None
+        self.lenfield_parent = None
+        self.lenfield = None
+        self.lenwire = False
+        self.bitfield = False
+
+        self.op = None
+        self.lhs = None
+        self.rhs = None
+
+        if elt.tag == 'list':
+            # List going into a request, which has no length field (inferred by server)
+            self.lenfield_name = elt.get('name') + '_len'
+            self.lenfield_type = 'CARD32'
+
+        elif elt.tag == 'fieldref':
+            # Standard list with a fieldref
+            self.lenfield_name = elt.text
+
+        elif elt.tag == 'valueparam':
+            # Value-mask.  The length bitmask is described by attributes.
+            self.lenfield_name = elt.get('value-mask-name')
+            self.lenfield_type = elt.get('value-mask-type')
+            self.lenwire = True
+            self.bitfield = True
+
+        elif elt.tag == 'op':
+            # Op field.  Need to recurse.
+            self.op = elt.get('op')
+            self.lhs = Expression(list(elt)[0], parent)
+            self.rhs = Expression(list(elt)[1], parent)
+
+            # Hopefully we don't have two separate length fields...
+            self.lenfield_name = self.lhs.lenfield_name
+            if self.lenfield_name == None:
+                self.lenfield_name = self.rhs.lenfield_name
+
+        elif elt.tag == 'unop':
+            # Op field.  Need to recurse.
+            self.op = elt.get('op')
+            self.rhs = Expression(list(elt)[0], parent)
+
+            self.lenfield_name = self.rhs.lenfield_name
+            
+        elif elt.tag == 'value':
+            # Constant expression
+            self.nmemb = int(elt.text, 0)
+
+        elif elt.tag == 'popcount':
+            self.op = 'popcount'
+            self.rhs = Expression(list(elt)[0], parent)
+            self.lenfield_name = self.rhs.lenfield_name
+            # xcb_popcount returns 'int' - handle the type in the language-specific part
+
+        elif elt.tag == 'enumref':
+            self.op = 'enumref'
+            self.lenfield_name = (elt.get('ref'), elt.text)
+            
+        elif elt.tag == 'sumof':
+            self.op = 'sumof'
+            self.lenfield_name = elt.get('ref')
+
+        else:
+            # Notreached
+            raise Exception("undefined tag '%s'" % elt.tag)
+
+    def fixed_size(self):
+        return self.nmemb != None
+
+    def resolve(self, module, parents):
+        if self.op == 'enumref':
+            self.lenfield_type = module.get_type(self.lenfield_name[0])
+            self.lenfield_name = self.lenfield_name[1]
+        elif self.op == 'sumof':
+            # need to find the field with lenfield_name
+            for p in reversed(parents): 
+                fields = dict([(f.field_name, f) for f in p.fields])
+                if self.lenfield_name in fields.keys():
+                    if p.is_bitcase:
+                        # switch is the anchestor 
+                        self.lenfield_parent = p.parents[-1]
+                    else:
+                        self.lenfield_parent = p
+                    self.lenfield_type = fields[self.lenfield_name].field_type
+                    break
+                    
diff --git a/libxcb/xcb-proto/xcbgen/xtypes.py b/libxcb/xcb-proto/xcbgen/xtypes.py
index c78915846..f6d463445 100644
--- a/libxcb/xcb-proto/xcbgen/xtypes.py
+++ b/libxcb/xcb-proto/xcbgen/xtypes.py
@@ -56,7 +56,7 @@ class Type(object):
         '''
         raise Exception('abstract fixed_size method not overridden!')
 
-    def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto):
+    def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto, enum=None):
         '''
         Default method for making a data type a member of a structure.
         Extend this if the data type needs to add an additional length field or something.
@@ -65,7 +65,7 @@ class Type(object):
         complex_type is the structure object.
         see Field for the meaning of the other parameters.
         '''
-        new_field = Field(self, field_type, field_name, visible, wire, auto)
+        new_field = Field(self, field_type, field_name, visible, wire, auto, enum)
 
         # We dump the _placeholder_byte if any fields are added.
         for (idx, field) in enumerate(complex_type.fields):
@@ -123,7 +123,11 @@ class Enum(SimpleType):
         SimpleType.__init__(self, name, 4)
         self.values = []
         self.bits = []
+        self.doc = None
         for item in list(elt):
+            if item.tag == 'doc':
+                self.doc = Doc(name, item)
+
             # First check if we're using a default value
             if len(list(item)) == 0:
                 self.values.append((item.get('name'), ''))
@@ -170,7 +174,7 @@ class ListType(Type):
         self.size = member.size if member.fixed_size() else None
         self.nmemb = self.expr.nmemb if self.expr.fixed_size() else None
 
-    def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto):
+    def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto, enum=None):
         if not self.fixed_size():
             # We need a length field.
             # Ask our Expression object for it's name, type, and whether it's on the wire.
@@ -189,10 +193,10 @@ class ListType(Type):
             if needlen:
                 type = module.get_type(lenfid)
                 lenfield_type = module.get_type_name(lenfid)
-                type.make_member_of(module, complex_type, lenfield_type, lenfield_name, True, lenwire, False)
+                type.make_member_of(module, complex_type, lenfield_type, lenfield_name, True, lenwire, False, enum)
 
         # Add ourself to the structure by calling our original method.
-        Type.make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto)
+        Type.make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto, enum)
 
     def resolve(self, module):
         if self.resolved:
@@ -278,6 +282,7 @@ class ComplexType(Type):
         if self.resolved:
             return
         pads = 0
+        enum = None
 
         # Resolve all of our field datatypes.
         for child in list(self.elt):
@@ -289,6 +294,7 @@ class ComplexType(Type):
                 visible = False
             elif child.tag == 'field':
                 field_name = child.get('name')
+                enum = child.get('enum')
                 fkey = child.get('type')
                 type = module.get_type(fkey)
                 visible = True
@@ -323,7 +329,7 @@ class ComplexType(Type):
             # Get the full type name for the field
             field_type = module.get_type_name(fkey)
             # Add the field to ourself
-            type.make_member_of(module, self, field_type, field_name, visible, True, False)
+            type.make_member_of(module, self, field_type, field_name, visible, True, False, enum)
             # Recursively resolve the type (could be another structure, list)
             type.resolve(module)
 
@@ -413,7 +419,7 @@ class SwitchType(ComplexType):
         self.calc_size() # Figure out how big we are
         self.resolved = True
 
-    def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto):
+    def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto, enum=None):
         if not self.fixed_size():
             # We need a length field.
             # Ask our Expression object for it's name, type, and whether it's on the wire.
@@ -432,10 +438,10 @@ class SwitchType(ComplexType):
             if needlen:
                 type = module.get_type(lenfid)
                 lenfield_type = module.get_type_name(lenfid)
-                type.make_member_of(module, complex_type, lenfield_type, lenfield_name, True, lenwire, False)
+                type.make_member_of(module, complex_type, lenfield_type, lenfield_name, True, lenwire, False, enum)
 
         # Add ourself to the structure by calling our original method.
-        Type.make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto)
+        Type.make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto, enum)
 
     # size for switch can only be calculated at runtime
     def calc_size(self):
@@ -483,7 +489,7 @@ class BitcaseType(ComplexType):
         self.parents = list(parent)
         self.is_bitcase = True
 
-    def make_member_of(self, module, switch_type, field_type, field_name, visible, wire, auto):
+    def make_member_of(self, module, switch_type, field_type, field_name, visible, wire, auto, enum=None):
         '''
         register BitcaseType with the corresponding SwitchType
 
@@ -491,7 +497,7 @@ class BitcaseType(ComplexType):
         complex_type is the structure object.
         see Field for the meaning of the other parameters.
         '''
-        new_field = Field(self, field_type, field_name, visible, wire, auto)
+        new_field = Field(self, field_type, field_name, visible, wire, auto, enum)
 
         # We dump the _placeholder_byte if any bitcases are added.
         for (idx, field) in enumerate(switch_type.bitcases):
@@ -518,6 +524,11 @@ class Reply(ComplexType):
     def __init__(self, name, elt):
         ComplexType.__init__(self, name, elt)
         self.is_reply = True
+        self.doc = None
+
+        for child in list(elt):
+            if child.tag == 'doc':
+                self.doc = Doc(name, child)
 
     def resolve(self, module):
         if self.resolved:
@@ -541,11 +552,14 @@ class Request(ComplexType):
     def __init__(self, name, elt):
         ComplexType.__init__(self, name, elt)
         self.reply = None
+        self.doc = None
         self.opcode = elt.get('opcode')
 
         for child in list(elt):
             if child.tag == 'reply':
                 self.reply = Reply(name, child)
+            if child.tag == 'doc':
+                self.doc = Doc(name, child)
 
     def resolve(self, module):
         if self.resolved:
@@ -581,6 +595,11 @@ class Event(ComplexType):
 
         tmp = elt.get('no-sequence-number')
         self.has_seq = (tmp == None or tmp.lower() == 'false' or tmp == '0')
+
+        self.doc = None
+        for item in list(elt):
+            if item.tag == 'doc':
+                self.doc = Doc(name, item)
             
     def add_opcode(self, opcode, name, main):
         self.opcodes[name] = opcode
@@ -629,4 +648,35 @@ class Error(ComplexType):
 
     out = __main__.output['error']
 
+
+class Doc(object):
+    '''
+    Class representing a <doc> tag.
+    '''
+    def __init__(self, name, elt):
+        self.name = name
+        self.description = None
+        self.brief = 'BRIEF DESCRIPTION MISSING'
+        self.fields = {}
+        self.errors = {}
+        self.see = {}
+        self.example = None
+
+        for child in list(elt):
+            text = child.text if child.text else ''
+            if child.tag == 'description':
+                self.description = text.strip()
+            if child.tag == 'brief':
+                self.brief = text.strip()
+            if child.tag == 'field':
+                self.fields[child.get('name')] = text.strip()
+            if child.tag == 'error':
+                self.errors[child.get('type')] = text.strip()
+            if child.tag == 'see':
+                self.see[child.get('name')] = child.get('type')
+            if child.tag == 'example':
+                self.example = text.strip()
+
+
+
 _placeholder_byte = Field(PadType(None), tcard8.name, 'pad0', False, True, False)
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 75d7e9d57..ff56e33b7 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1692,14 +1692,14 @@ ast_expression::hir(exec_list *instructions,
       ir_variable *var = 
 	 state->symbols->get_variable(this->primary_expression.identifier);
 
-      result = new(ctx) ir_dereference_variable(var);
-
       if (var != NULL) {
 	 var->used = true;
+	 result = new(ctx) ir_dereference_variable(var);
       } else {
 	 _mesa_glsl_error(& loc, state, "`%s' undeclared",
 			  this->primary_expression.identifier);
 
+	 result = ir_call::get_error_instruction(ctx);
 	 error_emitted = true;
       }
       break;
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index a5eca5a51..3c9d6e174 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1026,9 +1026,11 @@ ir_loop::ir_loop()
 
 ir_dereference_variable::ir_dereference_variable(ir_variable *var)
 {
+   assert(var != NULL);
+
    this->ir_type = ir_type_dereference_variable;
    this->var = var;
-   this->type = (var != NULL) ? var->type : glsl_type::error_type;
+   this->type = var->type;
 }
 
 
@@ -1055,19 +1057,18 @@ ir_dereference_array::ir_dereference_array(ir_variable *var,
 void
 ir_dereference_array::set_array(ir_rvalue *value)
 {
+   assert(value != NULL);
+
    this->array = value;
-   this->type = glsl_type::error_type;
 
-   if (this->array != NULL) {
-      const glsl_type *const vt = this->array->type;
+   const glsl_type *const vt = this->array->type;
 
-      if (vt->is_array()) {
-	 type = vt->element_type();
-      } else if (vt->is_matrix()) {
-	 type = vt->column_type();
-      } else if (vt->is_vector()) {
-	 type = vt->get_base_type();
-      }
+   if (vt->is_array()) {
+      type = vt->element_type();
+   } else if (vt->is_matrix()) {
+      type = vt->column_type();
+   } else if (vt->is_vector()) {
+      type = vt->get_base_type();
    }
 }
 
@@ -1075,11 +1076,12 @@ ir_dereference_array::set_array(ir_rvalue *value)
 ir_dereference_record::ir_dereference_record(ir_rvalue *value,
 					     const char *field)
 {
+   assert(value != NULL);
+
    this->ir_type = ir_type_dereference_record;
    this->record = value;
    this->field = ralloc_strdup(this, field);
-   this->type = (this->record != NULL)
-      ? this->record->type->field_type(field) : glsl_type::error_type;
+   this->type = this->record->type->field_type(field);
 }
 
 
@@ -1091,8 +1093,7 @@ ir_dereference_record::ir_dereference_record(ir_variable *var,
    this->ir_type = ir_type_dereference_record;
    this->record = new(ctx) ir_dereference_variable(var);
    this->field = ralloc_strdup(this, field);
-   this->type = (this->record != NULL)
-      ? this->record->type->field_type(field) : glsl_type::error_type;
+   this->type = this->record->type->field_type(field);
 }
 
 bool
diff --git a/mesalib/src/glsl/ir_expression_flattening.cpp b/mesalib/src/glsl/ir_expression_flattening.cpp
index 0b7c537bd..bd4ac67bc 100644
--- a/mesalib/src/glsl/ir_expression_flattening.cpp
+++ b/mesalib/src/glsl/ir_expression_flattening.cpp
@@ -27,7 +27,10 @@
  * Takes the leaves of expression trees and makes them dereferences of
  * assignments of the leaves to temporaries, according to a predicate.
  *
- * This is used for automatic function inlining, where we want to take
+ * This is used for breaking down matrix operations, where it's easier to
+ * create a temporary and work on each of its vector components individually.
+ *
+ * It is also used for automatic function inlining, where we want to take
  * an expression containing a call and move the call out to its own
  * assignment so that we can inline it at the appropriate place in the
  * instruction stream.
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 8278e43ad..09ffdff63 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -1319,9 +1319,11 @@ assign_attribute_or_color_locations(gl_shader_program *prog,
 	     * attribute overlaps any previously allocated bits.
 	     */
 	    if ((~(use_mask << attr) & used_locations) != used_locations) {
+	       const char *const string = (target_index == MESA_SHADER_VERTEX)
+		  ? "vertex shader input" : "fragment shader output";
 	       linker_error(prog,
-			    "insufficient contiguous attribute locations "
-			    "available for vertex shader input `%s'",
+			    "insufficient contiguous locations "
+			    "available for %s `%s'", string,
 			    var->name);
 	       return false;
 	    }
@@ -1370,7 +1372,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog,
 	    ? "vertex shader input" : "fragment shader output";
 
 	 linker_error(prog,
-		      "insufficient contiguous attribute locations "
+		      "insufficient contiguous locations "
 		      "available for %s `%s'",
 		      string, to_assign[i].var->name);
 	 return false;
diff --git a/mesalib/src/mapi/glapi/gen/ARB_blend_func_extended.xml b/mesalib/src/mapi/glapi/gen/ARB_blend_func_extended.xml
new file mode 100644
index 000000000..32adcde77
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_blend_func_extended.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_blend_func_extended" number="78">
+
+    <function name="BindFragDataLocationIndexed" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="colorNumber" type="GLuint"/>
+        <param name="index" type="GLuint"/>
+        <param name="name" type="const GLchar *"/>
+    </function>
+
+    <function name="GetFragDataIndex" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="name" type="const GLchar *"/>
+	  <return type="GLint"/>
+    </function>
+
+    <enum name="SRC1_COLOR" value="0x88F9"/>
+    <!-- SRC1_ALPHA is defined in core GL -->
+    <enum name="ONE_MINUS_SRC1_COLOR" value="0x88FA"/>
+    <enum name="ONE_MINUS_SRC1_ALPHA" value="0x88FB"/>
+
+    <enum name="MAX_DUAL_SOURCE_DRAW_BUFFERS" value="0x88FC"/>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_depth_buffer_float.xml b/mesalib/src/mapi/glapi/gen/ARB_depth_buffer_float.xml
new file mode 100644
index 000000000..7d25f6b0e
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_depth_buffer_float.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_depth_buffer_float" number="43">
+
+    <enum name="DEPTH_COMPONENT32F"        value = "0x8CAC"/>
+    <enum name="DEPTH32F_STENCIL8"         value = "0x8CAD"/>
+
+    <enum name="FLOAT_32_UNSIGNED_INT_24_8_REV" value = "0x8DAD"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml
new file mode 100644
index 000000000..714f09741
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_compression_rgtc" number="52">
+
+    <enum name="COMPRESSED_RED_RGTC1"        value = "0x8DBB"/>
+    <enum name="COMPRESSED_SIGNED_RED_RGTC1" value = "0x8DBC"/>
+    <enum name="COMPRESSED_RG_RGTC2"         value = "0x8DBD"/>
+    <enum name="COMPRESSED_SIGNED_RG_RGTC2"  value = "0x8DBE"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_float.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_float.xml
new file mode 100644
index 000000000..5db7691c8
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_float.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_float" number="41">
+
+    <enum name="TEXTURE_RED_TYPE_ARB"      value="0x8C10"/>
+    <enum name="TEXTURE_GREEN_TYPE_ARB"    value="0x8C11"/>
+    <enum name="TEXTURE_BLUE_TYPE_ARB"     value="0x8C12"/>
+    <enum name="TEXTURE_ALPHA_TYPE_ARB"    value="0x8C13"/>
+    <enum name="TEXTURE_LUMINANCE_TYPE_ARB" value="0x8C14"/>
+    <enum name="TEXTURE_INTENSITY_TYPE_ARB" value="0x8C15"/>
+    <enum name="TEXTURE_DEPTH_TYPE_ARB"    value="0x8C16"/>
+
+    <!-- The unsuffixed version of this is in ARB_framebuffer_object.xml -->
+    <enum name="UNSIGNED_NORMALIZED_ARB"   value="0x8C17"/>
+
+    <!-- Note only the RGBA/RGB formats have unsuffixed core GL equivalents,
+         since LUMINANCE/INTENSITY/ALPHA formats were deprecated. -->
+    <enum name="RGBA32F_ARB"               value="0x8814"/>
+    <enum name="RGB32F_ARB"                value="0x8815"/>
+    <enum name="ALPHA32F_ARB"              value="0x8816"/>
+    <enum name="INTENSITY32F_ARB"          value="0x8817"/>
+    <enum name="LUMINANCE32F_ARB"          value="0x8818"/>
+    <enum name="LUMINANCE_ALPHA32F_ARB"    value="0x8819"/>
+    <enum name="RGBA16F_ARB"               value="0x881A"/>
+    <enum name="RGB16F_ARB"                value="0x881B"/>
+    <enum name="ALPHA16F_ARB"              value="0x881C"/>
+    <enum name="INTENSITY16F_ARB"          value="0x881D"/>
+    <enum name="LUMINANCE16F_ARB"          value="0x881E"/>
+    <enum name="LUMINANCE_ALPHA16F_ARB"    value="0x881F"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_rg.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_rg.xml
new file mode 100644
index 000000000..40c0ebf05
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_rg.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_rg" number="53">
+
+    <enum name="COMPRESSED_RED"            value = "0x8225"/>
+    <enum name="COMPRESSED_RG"             value = "0x8226"/>
+
+    <enum name="RG"                        value = "0x8227"/>
+    <enum name="RG_INTEGER"                value = "0x8228"/>
+
+    <enum name="R8"                        value = "0x8229"/>
+    <enum name="R16"                       value = "0x822A"/>
+
+    <enum name="RG8"                       value = "0x822B"/>
+    <enum name="RG16"                      value = "0x822C"/>
+
+    <enum name="R16F"                      value = "0x822D"/>
+    <enum name="R32F"                      value = "0x822E"/>
+
+    <enum name="RG16F"                     value = "0x822F"/>
+    <enum name="RG32F"                     value = "0x8230"/>
+
+    <enum name="R8I"                       value = "0x8231"/>
+    <enum name="R8UI"                      value = "0x8232"/>
+    <enum name="R16I"                      value = "0x8233"/>
+    <enum name="R16UI"                     value = "0x8234"/>
+    <enum name="R32I"                      value = "0x8235"/>
+    <enum name="R32UI"                     value = "0x8236"/>
+
+    <enum name="RG8I"                      value = "0x8237"/>
+    <enum name="RG8UI"                     value = "0x8238"/>
+    <enum name="RG16I"                     value = "0x8239"/>
+    <enum name="RG16UI"                    value = "0x823A"/>
+    <enum name="RG32I"                     value = "0x823B"/>
+    <enum name="RG32UI"                    value = "0x823C"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index cec9c916e..86a9a2c3d 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -23,8 +23,6 @@
   <enum name="CONTEXT_FLAGS"                    value="0x821E"/>
   <enum name="DEPTH_BUFFER"                     value="0x8223"/>
   <enum name="STENCIL_BUFFER"                   value="0x8224"/>
-  <enum name="COMPRESSED_RED"                   value="0x8225"/>
-  <enum name="COMPRESSED_RG"                    value="0x8226"/>
   <enum name="CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"  value="0x0001"/>
   <enum name="RGBA32F"                          value="0x8814"/>
   <enum name="RGB32F"                           value="0x8815"/>
@@ -37,6 +35,13 @@
   <enum name="CLAMP_READ_COLOR"                 value="0x891C"/>
   <enum name="FIXED_ONLY"                       value="0x891D"/>
   <enum name="MAX_VARYING_COMPONENTS"           value="0x8B4B"/>
+  <enum name="TEXTURE_RED_TYPE"                 value="0x8C10"/>
+  <enum name="TEXTURE_GREEN_TYPE"               value="0x8C11"/>
+  <enum name="TEXTURE_BLUE_TYPE"                value="0x8C12"/>
+  <enum name="TEXTURE_ALPHA_TYPE"               value="0x8C13"/>
+  <enum name="TEXTURE_LUMINANCE_TYPE"           value="0x8C14"/>
+  <enum name="TEXTURE_INTENSITY_TYPE"           value="0x8C15"/>
+  <enum name="TEXTURE_DEPTH_TYPE"               value="0x8C16"/>
   <enum name="TEXTURE_1D_ARRAY"                 value="0x8C18"/>
   <enum name="PROXY_TEXTURE_1D_ARRAY"           value="0x8C19"/>
   <enum name="TEXTURE_2D_ARRAY"                 value="0x8C1A"/>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 44939e354..49dfd75bf 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -66,6 +66,7 @@ API_XML = \
 	ARB_color_buffer_float.xml \
 	ARB_copy_buffer.xml \
 	ARB_debug_output.xml \
+	ARB_depth_buffer_float.xml \
 	ARB_depth_clamp.xml \
 	ARB_draw_buffers_blend.xml \
 	ARB_draw_elements_base_vertex.xml \
@@ -80,6 +81,9 @@ API_XML = \
 	ARB_seamless_cube_map.xml \
 	ARB_sync.xml \
 	ARB_texture_buffer_object.xml \
+	ARB_texture_compression_rgtc.xml \
+	ARB_texture_float.xml \
+	ARB_texture_rg.xml \
 	ARB_texture_storage.xml \
 	ARB_vertex_array_object.xml \
 	AMD_draw_buffers_blend.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 9f8635611..a74577d1f 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7893,44 +7893,106 @@
     </enum>
 </category>
 
-<xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 40. GL_ARB_half_float_pixel -->
+
+<xi:include href="ARB_texture_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 42. GL_ARB_pixel_buffer_object -->
+
+<xi:include href="ARB_depth_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 46. GL_ARB_framebuffer_sRGB -->
 
-<xi:include href="ARB_depth_clamp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 48. GL_ARB_half_float_vertex -->
+
+<xi:include href="ARB_instanced_arrays.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_map_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_texture_compression_rgtc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_texture_rg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_sync.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- ARB extension number 55 is a GLX extension. -->
+<!-- ARB extension number 56 is a WGL extension. -->
+<!-- 57. GL_ARB_uniform_buffer_object -->
+<!-- 58. GL_ARB_compatibility -->
 
-<xi:include href="ARB_seamless_cube_map.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 60. GL_ARB_shader_texture_lod -->
+
+<xi:include href="ARB_depth_clamp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_draw_elements_base_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="NV_conditional_render.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 63. GL_ARB_fragment_coord_conventions -->
+<!-- 64. GL_ARB_provoking_vertex -->
 
-<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_seamless_cube_map.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_sync.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 67. GL_ARB_texture_multisample -->
+<!-- 68. GL_ARB_vertex_array_bgra -->
+
+<xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="AMD_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 70. GL_ARB_sample_shading -->
+<!-- 71. GL_ARB_texture_cube_map_array -->
+<!-- 72. GL_ARB_texture_gather -->
+<!-- 73. GL_ARB_texture_query_lod -->
+
+<!-- ARB extension number 74 is a WGL extension. -->
+<!-- ARB extension number 75 is a GLX extension. -->
+
+<!-- 76. GL_ARB_shading_language_include -->
+<!-- 77. GL_ARB_texture_compression_bptc -->
+
+<xi:include href="ARB_blend_func_extended.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 79. GL_ARB_explicit_attrib_location -->
+<!-- 80. GL_ARB_occlusion_query2 -->
 
 <xi:include href="ARB_sampler_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 82. GL_ARB_shader_bit_encoding -->
 
-<xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_texture_rgb10_a2ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- 84. GL_ARB_texture_swizzle -->
+<!-- 85. GL_ARB_timer_query -->
 
-<xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_vertex_type_2_10_10_10_rev.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #86...#94 -->
+
+<xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #96...#103 -->
 
 <xi:include href="ARB_debug_output.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extensions #106...#116 -->
+
+<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
@@ -12417,17 +12479,11 @@
 <xi:include href="EXT_gpu_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="GL3x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_instanced_arrays.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-<xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="AMD_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-<xi:include href="ARB_texture_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="NV_conditional_render.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_vertex_type_2_10_10_10_rev.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<xi:include href="ARB_texture_rgb10_a2ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c
index abb0d0109..e4f75fe7b 100644
--- a/mesalib/src/mapi/glapi/glapi_gentable.c
+++ b/mesalib/src/mapi/glapi/glapi_gentable.c
@@ -5813,6 +5813,20 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->BindFragDataLocationIndexed) {
+        void ** procp = (void **) &disp->BindFragDataLocationIndexed;
+        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocationIndexed", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetFragDataIndex) {
+        void ** procp = (void **) &disp->GetFragDataIndex;
+        snprintf(symboln, sizeof(symboln), "%sGetFragDataIndex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->BindSampler) {
         void ** procp = (void **) &disp->BindSampler;
         snprintf(symboln, sizeof(symboln), "%sBindSampler", symbol_prefix);
@@ -8300,14 +8314,14 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->PrimitiveRestartIndexNV) {
         void ** procp = (void **) &disp->PrimitiveRestartIndexNV;
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->PrimitiveRestartIndexNV) {
         void ** procp = (void **) &disp->PrimitiveRestartIndexNV;
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
@@ -9266,56 +9280,56 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->BeginConditionalRenderNV) {
         void ** procp = (void **) &disp->BeginConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BeginConditionalRenderNV) {
         void ** procp = (void **) &disp->BeginConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndConditionalRenderNV) {
         void ** procp = (void **) &disp->EndConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndConditionalRenderNV) {
         void ** procp = (void **) &disp->EndConditionalRenderNV;
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BeginTransformFeedbackEXT) {
         void ** procp = (void **) &disp->BeginTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BeginTransformFeedbackEXT) {
         void ** procp = (void **) &disp->BeginTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BindBufferBaseEXT) {
         void ** procp = (void **) &disp->BindBufferBaseEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BindBufferBaseEXT) {
         void ** procp = (void **) &disp->BindBufferBaseEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
@@ -9329,56 +9343,56 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->BindBufferRangeEXT) {
         void ** procp = (void **) &disp->BindBufferRangeEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->BindBufferRangeEXT) {
         void ** procp = (void **) &disp->BindBufferRangeEXT;
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndTransformFeedbackEXT) {
         void ** procp = (void **) &disp->EndTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->EndTransformFeedbackEXT) {
         void ** procp = (void **) &disp->EndTransformFeedbackEXT;
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->GetTransformFeedbackVaryingEXT) {
         void ** procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->GetTransformFeedbackVaryingEXT) {
         void ** procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->TransformFeedbackVaryingsEXT) {
         void ** procp = (void **) &disp->TransformFeedbackVaryingsEXT;
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->TransformFeedbackVaryingsEXT) {
         void ** procp = (void **) &disp->TransformFeedbackVaryingsEXT;
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
diff --git a/mesalib/src/mapi/glapi/glapi_mapi_tmp.h b/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
index 647ac9d79..dea5d875e 100644
--- a/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
+++ b/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
@@ -813,6 +813,8 @@ GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateiARB)(GLuint buf, GLenum srcRG
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateIndexedAMD)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFunciARB)(GLuint buf, GLenum src, GLenum dst);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncIndexedAMD)(GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataIndex)(GLuint program, const GLchar *name);
 GLAPI void APIENTRY GLAPI_PREFIX(BindSampler)(GLuint unit, GLuint sampler);
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteSamplers)(GLsizei count, const GLuint *samplers);
 GLAPI void APIENTRY GLAPI_PREFIX(GenSamplers)(GLsizei count, GLuint *samplers);
@@ -877,9 +879,9 @@ GLAPI void APIENTRY GLAPI_PREFIX(DepthRangef)(GLclampf zNear, GLclampf zFar);
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
 GLAPI void APIENTRY GLAPI_PREFIX(ReleaseShaderCompiler)(void);
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_665)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_666)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_667)(GLuint program, GLenum pname, GLint value);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_667)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_668)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_669)(GLuint program, GLenum pname, GLint value);
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid *userParam);
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB *buf);
@@ -911,24 +913,24 @@ GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage1DEXT)(GLuint texture, GLenum tar
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
 GLAPI void APIENTRY GLAPI_PREFIX(PolygonOffsetEXT)(GLfloat factor, GLfloat bias);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_699)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_700)(const GLfloat *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_701)(GLint x, GLint y, GLint z, GLint width, GLint height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_702)(const GLint *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_703)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_704)(const GLshort *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_705)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_706)(const GLfixed *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_707)(GLenum type, GLsizei stride, const GLvoid *pointer);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_708)(GLenum pname, GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_709)(GLenum pname, GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(GLenum pname, GLfloat param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(GLenum pname, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_713)(GLenum pname, const GLint *params);
-GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_714)(GLfixed *mantissa, GLint *exponent);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_715)(GLclampf value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_716)(GLenum pattern);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_701)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_702)(const GLfloat *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_703)(GLint x, GLint y, GLint z, GLint width, GLint height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_704)(const GLint *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_705)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_706)(const GLshort *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_707)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_708)(const GLfixed *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_709)(GLenum type, GLsizei stride, const GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(GLenum pname, GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(GLenum pname, GLint *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLenum pname, GLfloat param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_713)(GLenum pname, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_714)(GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_715)(GLenum pname, const GLint *params);
+GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_716)(GLfixed *mantissa, GLint *exponent);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_717)(GLclampf value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_718)(GLenum pattern);
 GLAPI void APIENTRY GLAPI_PREFIX(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
@@ -991,7 +993,7 @@ GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfEXT)(GLfloat coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordf)(GLfloat coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfvEXT)(const GLfloat *coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfv)(const GLfloat *coord);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_751)(GLenum mode);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_753)(GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 GLAPI void APIENTRY GLAPI_PREFIX(FlushVertexArrayRangeNV)(void);
@@ -1066,15 +1068,15 @@ GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLi
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4ivMESA)(const GLint *v);
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w);
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4svMESA)(const GLshort *v);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_793)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_794)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_795)(GLsizei n, const GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_796)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_797)(GLsizei n, GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_798)(GLuint fence, GLenum pname, GLint *params);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_799)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_800)(GLuint fence, GLenum condition);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_795)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_796)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_797)(GLsizei n, const GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_798)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_799)(GLsizei n, GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_800)(GLuint fence, GLenum pname, GLint *params);
 GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_801)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_802)(GLuint fence, GLenum condition);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_803)(GLuint fence);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(AreProgramsResidentNV)(GLsizei n, const GLuint *ids, GLboolean *residences);
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramNV)(GLenum target, GLuint program);
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramARB)(GLenum target, GLuint program);
@@ -1163,12 +1165,12 @@ GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriNV)(GLenum pname, GLint param);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteri)(GLenum pname, GLint param);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterivNV)(GLenum pname, const GLint *params);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriv)(GLenum pname, const GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_882)(GLenum face);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_883)(GLuint array);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_884)(GLsizei n, const GLuint *arrays);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_884)(GLenum face);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_885)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_886)(GLsizei n, const GLuint *arrays);
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_885)(GLsizei n, GLuint *arrays);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_886)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_887)(GLsizei n, GLuint *arrays);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_888)(GLuint array);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsVertexArray)(GLuint array);
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
@@ -1179,54 +1181,54 @@ GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fvNV)(GLuint id, GLsizei
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndexNV)(GLuint index);
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndex)(GLuint index);
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartNV)(void);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_895)(GLenum func, GLclampx ref);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_896)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_897)(GLclampx depth);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_898)(GLenum plane, const GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_899)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_900)(GLclampx zNear, GLclampx zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_901)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_902)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_903)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_904)(GLenum plane, GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_905)(GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_906)(GLenum light, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_907)(GLenum face, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_908)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_909)(GLenum coord, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_897)(GLenum func, GLclampx ref);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_898)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_899)(GLclampx depth);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_900)(GLenum plane, const GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_901)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_902)(GLclampx zNear, GLclampx zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_903)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_904)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_905)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_906)(GLenum plane, GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_907)(GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_908)(GLenum light, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_909)(GLenum face, GLenum pname, GLfixed *params);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_910)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_911)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_912)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_913)(GLenum light, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_914)(GLenum light, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_915)(GLfixed width);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_916)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_917)(GLenum face, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_918)(GLenum face, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_919)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_920)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_921)(GLfixed nx, GLfixed ny, GLfixed nz);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_922)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_923)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_924)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_925)(GLfixed size);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_926)(GLfixed factor, GLfixed units);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_927)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_928)(GLclampx value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_929)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_930)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_931)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_932)(GLenum coord, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_933)(GLenum coord, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_934)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_935)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_936)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLenum plane, const GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_939)(GLenum plane, GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_911)(GLenum coord, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_912)(GLenum target, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_913)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_914)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_915)(GLenum light, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_916)(GLenum light, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_917)(GLfixed width);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_918)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_919)(GLenum face, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_920)(GLenum face, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_921)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_922)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_923)(GLfixed nx, GLfixed ny, GLfixed nz);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_924)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_925)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_926)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_927)(GLfixed size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_928)(GLfixed factor, GLfixed units);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_929)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_930)(GLclampx value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_931)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_932)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_933)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_934)(GLenum coord, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_935)(GLenum coord, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_936)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_939)(GLenum plane, const GLfloat *equation);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_940)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_941)(GLclampd zmin, GLclampd zmax);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_942)(GLenum modeRGB, GLenum modeA);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_941)(GLenum plane, GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_942)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_943)(GLclampd zmin, GLclampd zmax);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_944)(GLenum modeRGB, GLenum modeA);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebufferEXT)(GLenum target, GLuint framebuffer);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebuffer)(GLenum target, GLuint framebuffer);
@@ -1262,10 +1264,10 @@ GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbufferEXT)(GLuint renderbuffer);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbuffer)(GLuint renderbuffer);
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_960)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_962)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 GLAPI void APIENTRY GLAPI_PREFIX(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_961)(GLenum target, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_962)(GLenum target, GLintptr offset, GLsizeiptr size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_963)(GLenum target, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_964)(GLenum target, GLintptr offset, GLsizeiptr size);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocationEXT)(GLuint program, const GLchar *name);
@@ -1378,8 +1380,8 @@ GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryingsEXT)(GLuint program, G
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertexEXT)(GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertex)(GLenum mode);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1020)(GLenum target, GLenum pname, GLvoid **params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1021)(GLenum target, GLsizei length, GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1022)(GLenum target, GLenum pname, GLvoid **params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1023)(GLenum target, GLsizei length, GLvoid *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint *value);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option);
@@ -1387,11 +1389,11 @@ GLAPI void APIENTRY GLAPI_PREFIX(ActiveProgramEXT)(GLuint program);
 GLAPI GLuint APIENTRY GLAPI_PREFIX(CreateShaderProgramEXT)(GLenum type, const GLchar *string);
 GLAPI void APIENTRY GLAPI_PREFIX(UseShaderProgramEXT)(GLenum type, GLuint program);
 GLAPI void APIENTRY GLAPI_PREFIX(TextureBarrierNV)(void);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1029)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1030)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1031)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1032)(GLuint id, GLenum pname, GLint64EXT *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1033)(GLuint id, GLenum pname, GLuint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1031)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1032)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1033)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1034)(GLuint id, GLenum pname, GLint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1035)(GLuint id, GLenum pname, GLuint64EXT *params);
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid *writeOffset);
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetTexture2DOES)(GLenum target, GLvoid *writeOffset);
 #undef MAPI_TMP_DEFINES
@@ -6879,3412 +6881,3426 @@ GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncIndexedAMD)(GLuint buf, GLenum src, GL
    ((void (APIENTRY *)(GLuint buf, GLenum src, GLenum dst)) _func)(buf, src, dst);
 }
 
-GLAPI void APIENTRY GLAPI_PREFIX(BindSampler)(GLuint unit, GLuint sampler)
+GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
    mapi_func _func = ((const mapi_func *) _tbl)[601];
+   ((void (APIENTRY *)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)) _func)(program, colorNumber, index, name);
+}
+
+GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataIndex)(GLuint program, const GLchar *name)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[602];
+   return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(BindSampler)(GLuint unit, GLuint sampler)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[603];
    ((void (APIENTRY *)(GLuint unit, GLuint sampler)) _func)(unit, sampler);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteSamplers)(GLsizei count, const GLuint *samplers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[602];
+   mapi_func _func = ((const mapi_func *) _tbl)[604];
    ((void (APIENTRY *)(GLsizei count, const GLuint *samplers)) _func)(count, samplers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenSamplers)(GLsizei count, GLuint *samplers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[603];
+   mapi_func _func = ((const mapi_func *) _tbl)[605];
    ((void (APIENTRY *)(GLsizei count, GLuint *samplers)) _func)(count, samplers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[604];
+   mapi_func _func = ((const mapi_func *) _tbl)[606];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[605];
+   mapi_func _func = ((const mapi_func *) _tbl)[607];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLuint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[606];
+   mapi_func _func = ((const mapi_func *) _tbl)[608];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLfloat *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[607];
+   mapi_func _func = ((const mapi_func *) _tbl)[609];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsSampler)(GLuint sampler)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[608];
+   mapi_func _func = ((const mapi_func *) _tbl)[610];
    return ((GLboolean (APIENTRY *)(GLuint sampler)) _func)(sampler);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[609];
+   mapi_func _func = ((const mapi_func *) _tbl)[611];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[610];
+   mapi_func _func = ((const mapi_func *) _tbl)[612];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLuint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[611];
+   mapi_func _func = ((const mapi_func *) _tbl)[613];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLfloat param)) _func)(sampler, pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[612];
+   mapi_func _func = ((const mapi_func *) _tbl)[614];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLfloat *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteri)(GLuint sampler, GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[613];
+   mapi_func _func = ((const mapi_func *) _tbl)[615];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint param)) _func)(sampler, pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[614];
+   mapi_func _func = ((const mapi_func *) _tbl)[616];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP3ui)(GLenum type, GLuint color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[615];
+   mapi_func _func = ((const mapi_func *) _tbl)[617];
    ((void (APIENTRY *)(GLenum type, GLuint color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP3uiv)(GLenum type, const GLuint *color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[616];
+   mapi_func _func = ((const mapi_func *) _tbl)[618];
    ((void (APIENTRY *)(GLenum type, const GLuint *color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP4ui)(GLenum type, GLuint color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[617];
+   mapi_func _func = ((const mapi_func *) _tbl)[619];
    ((void (APIENTRY *)(GLenum type, GLuint color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP4uiv)(GLenum type, const GLuint *color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[618];
+   mapi_func _func = ((const mapi_func *) _tbl)[620];
    ((void (APIENTRY *)(GLenum type, const GLuint *color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[619];
+   mapi_func _func = ((const mapi_func *) _tbl)[621];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[620];
+   mapi_func _func = ((const mapi_func *) _tbl)[622];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[621];
+   mapi_func _func = ((const mapi_func *) _tbl)[623];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[622];
+   mapi_func _func = ((const mapi_func *) _tbl)[624];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[623];
+   mapi_func _func = ((const mapi_func *) _tbl)[625];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[624];
+   mapi_func _func = ((const mapi_func *) _tbl)[626];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[625];
+   mapi_func _func = ((const mapi_func *) _tbl)[627];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[626];
+   mapi_func _func = ((const mapi_func *) _tbl)[628];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalP3ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[627];
+   mapi_func _func = ((const mapi_func *) _tbl)[629];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalP3uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[628];
+   mapi_func _func = ((const mapi_func *) _tbl)[630];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorP3ui)(GLenum type, GLuint color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[629];
+   mapi_func _func = ((const mapi_func *) _tbl)[631];
    ((void (APIENTRY *)(GLenum type, GLuint color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorP3uiv)(GLenum type, const GLuint *color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[630];
+   mapi_func _func = ((const mapi_func *) _tbl)[632];
    ((void (APIENTRY *)(GLenum type, const GLuint *color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP1ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[631];
+   mapi_func _func = ((const mapi_func *) _tbl)[633];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP1uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[632];
+   mapi_func _func = ((const mapi_func *) _tbl)[634];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP2ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[633];
+   mapi_func _func = ((const mapi_func *) _tbl)[635];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP2uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[634];
+   mapi_func _func = ((const mapi_func *) _tbl)[636];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP3ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[635];
+   mapi_func _func = ((const mapi_func *) _tbl)[637];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP3uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[636];
+   mapi_func _func = ((const mapi_func *) _tbl)[638];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP4ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[637];
+   mapi_func _func = ((const mapi_func *) _tbl)[639];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP4uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[638];
+   mapi_func _func = ((const mapi_func *) _tbl)[640];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[639];
+   mapi_func _func = ((const mapi_func *) _tbl)[641];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[640];
+   mapi_func _func = ((const mapi_func *) _tbl)[642];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[641];
+   mapi_func _func = ((const mapi_func *) _tbl)[643];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[642];
+   mapi_func _func = ((const mapi_func *) _tbl)[644];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[643];
+   mapi_func _func = ((const mapi_func *) _tbl)[645];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[644];
+   mapi_func _func = ((const mapi_func *) _tbl)[646];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[645];
+   mapi_func _func = ((const mapi_func *) _tbl)[647];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[646];
+   mapi_func _func = ((const mapi_func *) _tbl)[648];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP2ui)(GLenum type, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[647];
+   mapi_func _func = ((const mapi_func *) _tbl)[649];
    ((void (APIENTRY *)(GLenum type, GLuint value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP2uiv)(GLenum type, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[648];
+   mapi_func _func = ((const mapi_func *) _tbl)[650];
    ((void (APIENTRY *)(GLenum type, const GLuint *value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP3ui)(GLenum type, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[649];
+   mapi_func _func = ((const mapi_func *) _tbl)[651];
    ((void (APIENTRY *)(GLenum type, GLuint value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP3uiv)(GLenum type, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[650];
+   mapi_func _func = ((const mapi_func *) _tbl)[652];
    ((void (APIENTRY *)(GLenum type, const GLuint *value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP4ui)(GLenum type, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[651];
+   mapi_func _func = ((const mapi_func *) _tbl)[653];
    ((void (APIENTRY *)(GLenum type, GLuint value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP4uiv)(GLenum type, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[652];
+   mapi_func _func = ((const mapi_func *) _tbl)[654];
    ((void (APIENTRY *)(GLenum type, const GLuint *value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindTransformFeedback)(GLenum target, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[653];
+   mapi_func _func = ((const mapi_func *) _tbl)[655];
    ((void (APIENTRY *)(GLenum target, GLuint id)) _func)(target, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[654];
+   mapi_func _func = ((const mapi_func *) _tbl)[656];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawTransformFeedback)(GLenum mode, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[655];
+   mapi_func _func = ((const mapi_func *) _tbl)[657];
    ((void (APIENTRY *)(GLenum mode, GLuint id)) _func)(mode, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenTransformFeedbacks)(GLsizei n, GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[656];
+   mapi_func _func = ((const mapi_func *) _tbl)[658];
    ((void (APIENTRY *)(GLsizei n, GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsTransformFeedback)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[657];
+   mapi_func _func = ((const mapi_func *) _tbl)[659];
    return ((GLboolean (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PauseTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[658];
+   mapi_func _func = ((const mapi_func *) _tbl)[660];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ResumeTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[659];
+   mapi_func _func = ((const mapi_func *) _tbl)[661];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearDepthf)(GLclampf depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[660];
+   mapi_func _func = ((const mapi_func *) _tbl)[662];
    ((void (APIENTRY *)(GLclampf depth)) _func)(depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DepthRangef)(GLclampf zNear, GLclampf zFar)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[661];
+   mapi_func _func = ((const mapi_func *) _tbl)[663];
    ((void (APIENTRY *)(GLclampf zNear, GLclampf zFar)) _func)(zNear, zFar);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[662];
+   mapi_func _func = ((const mapi_func *) _tbl)[664];
    ((void (APIENTRY *)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)) _func)(shadertype, precisiontype, range, precision);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ReleaseShaderCompiler)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[663];
+   mapi_func _func = ((const mapi_func *) _tbl)[665];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[664];
+   mapi_func _func = ((const mapi_func *) _tbl)[666];
    ((void (APIENTRY *)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)) _func)(n, shaders, binaryformat, binary, length);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid *userParam)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[668];
+   mapi_func _func = ((const mapi_func *) _tbl)[670];
    ((void (APIENTRY *)(GLDEBUGPROCARB callback, GLvoid *userParam)) _func)(callback, userParam);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[669];
+   mapi_func _func = ((const mapi_func *) _tbl)[671];
    ((void (APIENTRY *)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)) _func)(source, type, severity, count, ids, enabled);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB *buf)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[670];
+   mapi_func _func = ((const mapi_func *) _tbl)[672];
    ((void (APIENTRY *)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB *buf)) _func)(source, type, id, severity, length, buf);
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLcharARB *messageLog)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[671];
+   mapi_func _func = ((const mapi_func *) _tbl)[673];
    return ((GLuint (APIENTRY *)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLcharARB *messageLog)) _func)(count, bufsize, sources, types, ids, severities, lengths, messageLog);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(GetGraphicsResetStatusARB)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[672];
+   mapi_func _func = ((const mapi_func *) _tbl)[674];
    return ((GLenum (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[673];
+   mapi_func _func = ((const mapi_func *) _tbl)[675];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table)) _func)(target, format, type, bufSize, table);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid *img)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[674];
+   mapi_func _func = ((const mapi_func *) _tbl)[676];
    ((void (APIENTRY *)(GLenum target, GLint lod, GLsizei bufSize, GLvoid *img)) _func)(target, lod, bufSize, img);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[675];
+   mapi_func _func = ((const mapi_func *) _tbl)[677];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image)) _func)(target, format, type, bufSize, image);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[676];
+   mapi_func _func = ((const mapi_func *) _tbl)[678];
    ((void (APIENTRY *)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)) _func)(target, reset, format, type, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[677];
+   mapi_func _func = ((const mapi_func *) _tbl)[679];
    ((void (APIENTRY *)(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v)) _func)(target, query, bufSize, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[678];
+   mapi_func _func = ((const mapi_func *) _tbl)[680];
    ((void (APIENTRY *)(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v)) _func)(target, query, bufSize, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[679];
+   mapi_func _func = ((const mapi_func *) _tbl)[681];
    ((void (APIENTRY *)(GLenum target, GLenum query, GLsizei bufSize, GLint *v)) _func)(target, query, bufSize, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[680];
+   mapi_func _func = ((const mapi_func *) _tbl)[682];
    ((void (APIENTRY *)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)) _func)(target, reset, format, type, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[681];
+   mapi_func _func = ((const mapi_func *) _tbl)[683];
    ((void (APIENTRY *)(GLenum map, GLsizei bufSize, GLfloat *values)) _func)(map, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[682];
+   mapi_func _func = ((const mapi_func *) _tbl)[684];
    ((void (APIENTRY *)(GLenum map, GLsizei bufSize, GLuint *values)) _func)(map, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[683];
+   mapi_func _func = ((const mapi_func *) _tbl)[685];
    ((void (APIENTRY *)(GLenum map, GLsizei bufSize, GLushort *values)) _func)(map, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPolygonStippleARB)(GLsizei bufSize, GLubyte *pattern)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[684];
+   mapi_func _func = ((const mapi_func *) _tbl)[686];
    ((void (APIENTRY *)(GLsizei bufSize, GLubyte *pattern)) _func)(bufSize, pattern);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[685];
+   mapi_func _func = ((const mapi_func *) _tbl)[687];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span)) _func)(target, format, type, rowBufSize, row, columnBufSize, column, span);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[686];
+   mapi_func _func = ((const mapi_func *) _tbl)[688];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img)) _func)(target, level, format, type, bufSize, img);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[687];
+   mapi_func _func = ((const mapi_func *) _tbl)[689];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[688];
+   mapi_func _func = ((const mapi_func *) _tbl)[690];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[689];
+   mapi_func _func = ((const mapi_func *) _tbl)[691];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLint *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[690];
+   mapi_func _func = ((const mapi_func *) _tbl)[692];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[691];
+   mapi_func _func = ((const mapi_func *) _tbl)[693];
    ((void (APIENTRY *)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data)) _func)(x, y, width, height, format, type, bufSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[692];
+   mapi_func _func = ((const mapi_func *) _tbl)[694];
    ((void (APIENTRY *)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)) _func)(target, levels, internalFormat, width);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[693];
+   mapi_func _func = ((const mapi_func *) _tbl)[695];
    ((void (APIENTRY *)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)) _func)(target, levels, internalFormat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[694];
+   mapi_func _func = ((const mapi_func *) _tbl)[696];
    ((void (APIENTRY *)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)) _func)(target, levels, internalFormat, width, height, depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[695];
+   mapi_func _func = ((const mapi_func *) _tbl)[697];
    ((void (APIENTRY *)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)) _func)(texture, target, levels, internalFormat, width);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[696];
+   mapi_func _func = ((const mapi_func *) _tbl)[698];
    ((void (APIENTRY *)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)) _func)(texture, target, levels, internalFormat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[697];
+   mapi_func _func = ((const mapi_func *) _tbl)[699];
    ((void (APIENTRY *)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)) _func)(texture, target, levels, internalFormat, width, height, depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[698];
+   mapi_func _func = ((const mapi_func *) _tbl)[700];
    ((void (APIENTRY *)(GLfloat factor, GLfloat bias)) _func)(factor, bias);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[717];
+   mapi_func _func = ((const mapi_func *) _tbl)[719];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[718];
+   mapi_func _func = ((const mapi_func *) _tbl)[720];
    ((void (APIENTRY *)(GLsizei stride, GLsizei count, const GLboolean *pointer)) _func)(stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[719];
+   mapi_func _func = ((const mapi_func *) _tbl)[721];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[722];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[721];
+   mapi_func _func = ((const mapi_func *) _tbl)[723];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[722];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfEXT)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterf)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfARB)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfvEXT)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[726];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfv)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[726];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfvARB)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[726];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LockArraysEXT)(GLint first, GLsizei count)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[727];
    ((void (APIENTRY *)(GLint first, GLsizei count)) _func)(first, count);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UnlockArraysEXT)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[728];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[727];
+   mapi_func _func = ((const mapi_func *) _tbl)[729];
    ((void (APIENTRY *)(GLbyte red, GLbyte green, GLbyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[727];
+   mapi_func _func = ((const mapi_func *) _tbl)[729];
    ((void (APIENTRY *)(GLbyte red, GLbyte green, GLbyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bvEXT)(const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[728];
+   mapi_func _func = ((const mapi_func *) _tbl)[730];
    ((void (APIENTRY *)(const GLbyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bv)(const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[728];
+   mapi_func _func = ((const mapi_func *) _tbl)[730];
    ((void (APIENTRY *)(const GLbyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[731];
    ((void (APIENTRY *)(GLdouble red, GLdouble green, GLdouble blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[731];
    ((void (APIENTRY *)(GLdouble red, GLdouble green, GLdouble blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dvEXT)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[732];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[732];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    ((void (APIENTRY *)(GLfloat red, GLfloat green, GLfloat blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3f)(GLfloat red, GLfloat green, GLfloat blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    ((void (APIENTRY *)(GLfloat red, GLfloat green, GLfloat blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fvEXT)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3iEXT)(GLint red, GLint green, GLint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((void (APIENTRY *)(GLint red, GLint green, GLint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3i)(GLint red, GLint green, GLint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((void (APIENTRY *)(GLint red, GLint green, GLint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ivEXT)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((void (APIENTRY *)(GLshort red, GLshort green, GLshort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3s)(GLshort red, GLshort green, GLshort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((void (APIENTRY *)(GLshort red, GLshort green, GLshort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3svEXT)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((void (APIENTRY *)(GLubyte red, GLubyte green, GLubyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((void (APIENTRY *)(GLubyte red, GLubyte green, GLubyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubvEXT)(const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((void (APIENTRY *)(const GLubyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubv)(const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((void (APIENTRY *)(const GLubyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((void (APIENTRY *)(GLuint red, GLuint green, GLuint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((void (APIENTRY *)(GLuint red, GLuint green, GLuint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uivEXT)(const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((void (APIENTRY *)(const GLuint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uiv)(const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((void (APIENTRY *)(const GLuint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(GLushort red, GLushort green, GLushort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3us)(GLushort red, GLushort green, GLushort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(GLushort red, GLushort green, GLushort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usvEXT)(const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((void (APIENTRY *)(const GLushort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usv)(const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((void (APIENTRY *)(const GLushort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawArraysEXT)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawArrays)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElementsEXT)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElements)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddEXT)(GLdouble coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[747];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((void (APIENTRY *)(GLdouble coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordd)(GLdouble coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[747];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((void (APIENTRY *)(GLdouble coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddvEXT)(const GLdouble *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((void (APIENTRY *)(const GLdouble *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddv)(const GLdouble *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((void (APIENTRY *)(const GLdouble *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfEXT)(GLfloat coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[749];
+   mapi_func _func = ((const mapi_func *) _tbl)[751];
    ((void (APIENTRY *)(GLfloat coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordf)(GLfloat coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[749];
+   mapi_func _func = ((const mapi_func *) _tbl)[751];
    ((void (APIENTRY *)(GLfloat coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfvEXT)(const GLfloat *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[750];
+   mapi_func _func = ((const mapi_func *) _tbl)[752];
    ((void (APIENTRY *)(const GLfloat *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfv)(const GLfloat *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[750];
+   mapi_func _func = ((const mapi_func *) _tbl)[752];
    ((void (APIENTRY *)(const GLfloat *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[752];
+   mapi_func _func = ((const mapi_func *) _tbl)[754];
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[752];
+   mapi_func _func = ((const mapi_func *) _tbl)[754];
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FlushVertexArrayRangeNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[753];
+   mapi_func _func = ((const mapi_func *) _tbl)[755];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexArrayRangeNV)(GLsizei length, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[754];
+   mapi_func _func = ((const mapi_func *) _tbl)[756];
    ((void (APIENTRY *)(GLsizei length, const GLvoid *pointer)) _func)(length, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[755];
+   mapi_func _func = ((const mapi_func *) _tbl)[757];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)) _func)(stage, portion, variable, input, mapping, componentUsage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[756];
+   mapi_func _func = ((const mapi_func *) _tbl)[758];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)) _func)(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterfNV)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[757];
+   mapi_func _func = ((const mapi_func *) _tbl)[759];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterfvNV)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[758];
+   mapi_func _func = ((const mapi_func *) _tbl)[760];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameteriNV)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[759];
+   mapi_func _func = ((const mapi_func *) _tbl)[761];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterivNV)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[760];
+   mapi_func _func = ((const mapi_func *) _tbl)[762];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[761];
+   mapi_func _func = ((const mapi_func *) _tbl)[763];
    ((void (APIENTRY *)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)) _func)(variable, input, mapping, componentUsage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[762];
+   mapi_func _func = ((const mapi_func *) _tbl)[764];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params)) _func)(stage, portion, variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[763];
+   mapi_func _func = ((const mapi_func *) _tbl)[765];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params)) _func)(stage, portion, variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[764];
+   mapi_func _func = ((const mapi_func *) _tbl)[766];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params)) _func)(stage, portion, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[765];
+   mapi_func _func = ((const mapi_func *) _tbl)[767];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum pname, GLint *params)) _func)(stage, portion, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[766];
+   mapi_func _func = ((const mapi_func *) _tbl)[768];
    ((void (APIENTRY *)(GLenum variable, GLenum pname, GLfloat *params)) _func)(variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[767];
+   mapi_func _func = ((const mapi_func *) _tbl)[769];
    ((void (APIENTRY *)(GLenum variable, GLenum pname, GLint *params)) _func)(variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ResizeBuffersMESA)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[768];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dMESA)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2d)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dARB)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dvARB)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fMESA)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2f)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fARB)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fvARB)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iMESA)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2i)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iARB)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2ivARB)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sMESA)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2s)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sARB)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2svARB)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3d)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dARB)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dvARB)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3f)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fARB)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fvARB)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iMESA)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3i)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iARB)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3ivARB)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sMESA)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3s)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sARB)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[786];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[786];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3svARB)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[786];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[785];
+   mapi_func _func = ((const mapi_func *) _tbl)[787];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[786];
+   mapi_func _func = ((const mapi_func *) _tbl)[788];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[787];
+   mapi_func _func = ((const mapi_func *) _tbl)[789];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[788];
+   mapi_func _func = ((const mapi_func *) _tbl)[790];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[789];
+   mapi_func _func = ((const mapi_func *) _tbl)[791];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z, GLint w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[790];
+   mapi_func _func = ((const mapi_func *) _tbl)[792];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[791];
+   mapi_func _func = ((const mapi_func *) _tbl)[793];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z, GLshort w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[792];
+   mapi_func _func = ((const mapi_func *) _tbl)[794];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(AreProgramsResidentNV)(GLsizei n, const GLuint *ids, GLboolean *residences)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[802];
+   mapi_func _func = ((const mapi_func *) _tbl)[804];
    return ((GLboolean (APIENTRY *)(GLsizei n, const GLuint *ids, GLboolean *residences)) _func)(n, ids, residences);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramNV)(GLenum target, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[803];
+   mapi_func _func = ((const mapi_func *) _tbl)[805];
    ((void (APIENTRY *)(GLenum target, GLuint program)) _func)(target, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramARB)(GLenum target, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[803];
+   mapi_func _func = ((const mapi_func *) _tbl)[805];
    ((void (APIENTRY *)(GLenum target, GLuint program)) _func)(target, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteProgramsNV)(GLsizei n, const GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[804];
+   mapi_func _func = ((const mapi_func *) _tbl)[806];
    ((void (APIENTRY *)(GLsizei n, const GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteProgramsARB)(GLsizei n, const GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[804];
+   mapi_func _func = ((const mapi_func *) _tbl)[806];
    ((void (APIENTRY *)(GLsizei n, const GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[805];
+   mapi_func _func = ((const mapi_func *) _tbl)[807];
    ((void (APIENTRY *)(GLenum target, GLuint id, const GLfloat *params)) _func)(target, id, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenProgramsNV)(GLsizei n, GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[806];
+   mapi_func _func = ((const mapi_func *) _tbl)[808];
    ((void (APIENTRY *)(GLsizei n, GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenProgramsARB)(GLsizei n, GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[806];
+   mapi_func _func = ((const mapi_func *) _tbl)[808];
    ((void (APIENTRY *)(GLsizei n, GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[807];
+   mapi_func _func = ((const mapi_func *) _tbl)[809];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLenum pname, GLdouble *params)) _func)(target, index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[810];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLenum pname, GLfloat *params)) _func)(target, index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramStringNV)(GLuint id, GLenum pname, GLubyte *program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[809];
+   mapi_func _func = ((const mapi_func *) _tbl)[811];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLubyte *program)) _func)(id, pname, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramivNV)(GLuint id, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[810];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[811];
+   mapi_func _func = ((const mapi_func *) _tbl)[813];
    ((void (APIENTRY *)(GLenum target, GLuint address, GLenum pname, GLint *params)) _func)(target, address, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[812];
+   mapi_func _func = ((const mapi_func *) _tbl)[814];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[812];
+   mapi_func _func = ((const mapi_func *) _tbl)[814];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[812];
+   mapi_func _func = ((const mapi_func *) _tbl)[814];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[813];
+   mapi_func _func = ((const mapi_func *) _tbl)[815];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLdouble *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[814];
+   mapi_func _func = ((const mapi_func *) _tbl)[816];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLfloat *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribivNV)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[815];
+   mapi_func _func = ((const mapi_func *) _tbl)[817];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsProgramNV)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[816];
+   mapi_func _func = ((const mapi_func *) _tbl)[818];
    return ((GLboolean (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsProgramARB)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[816];
+   mapi_func _func = ((const mapi_func *) _tbl)[818];
    return ((GLboolean (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte *program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[817];
+   mapi_func _func = ((const mapi_func *) _tbl)[819];
    ((void (APIENTRY *)(GLenum target, GLuint id, GLsizei len, const GLubyte *program)) _func)(target, id, len, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[818];
+   mapi_func _func = ((const mapi_func *) _tbl)[820];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLsizei num, const GLdouble *params)) _func)(target, index, num, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[819];
+   mapi_func _func = ((const mapi_func *) _tbl)[821];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLsizei num, const GLfloat *params)) _func)(target, index, num, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RequestResidentProgramsNV)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[820];
+   mapi_func _func = ((const mapi_func *) _tbl)[822];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[821];
+   mapi_func _func = ((const mapi_func *) _tbl)[823];
    ((void (APIENTRY *)(GLenum target, GLuint address, GLenum matrix, GLenum transform)) _func)(target, address, matrix, transform);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dNV)(GLuint index, GLdouble x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[822];
+   mapi_func _func = ((const mapi_func *) _tbl)[824];
    ((void (APIENTRY *)(GLuint index, GLdouble x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[823];
+   mapi_func _func = ((const mapi_func *) _tbl)[825];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fNV)(GLuint index, GLfloat x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[824];
+   mapi_func _func = ((const mapi_func *) _tbl)[826];
    ((void (APIENTRY *)(GLuint index, GLfloat x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[825];
+   mapi_func _func = ((const mapi_func *) _tbl)[827];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1sNV)(GLuint index, GLshort x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[826];
+   mapi_func _func = ((const mapi_func *) _tbl)[828];
    ((void (APIENTRY *)(GLuint index, GLshort x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[827];
+   mapi_func _func = ((const mapi_func *) _tbl)[829];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[828];
+   mapi_func _func = ((const mapi_func *) _tbl)[830];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[829];
+   mapi_func _func = ((const mapi_func *) _tbl)[831];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[830];
+   mapi_func _func = ((const mapi_func *) _tbl)[832];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[831];
+   mapi_func _func = ((const mapi_func *) _tbl)[833];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[832];
+   mapi_func _func = ((const mapi_func *) _tbl)[834];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[833];
+   mapi_func _func = ((const mapi_func *) _tbl)[835];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[834];
+   mapi_func _func = ((const mapi_func *) _tbl)[836];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[835];
+   mapi_func _func = ((const mapi_func *) _tbl)[837];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[836];
+   mapi_func _func = ((const mapi_func *) _tbl)[838];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[837];
+   mapi_func _func = ((const mapi_func *) _tbl)[839];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[838];
+   mapi_func _func = ((const mapi_func *) _tbl)[840];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[839];
+   mapi_func _func = ((const mapi_func *) _tbl)[841];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[840];
+   mapi_func _func = ((const mapi_func *) _tbl)[842];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[841];
+   mapi_func _func = ((const mapi_func *) _tbl)[843];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[842];
+   mapi_func _func = ((const mapi_func *) _tbl)[844];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[843];
+   mapi_func _func = ((const mapi_func *) _tbl)[845];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[844];
+   mapi_func _func = ((const mapi_func *) _tbl)[846];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[845];
+   mapi_func _func = ((const mapi_func *) _tbl)[847];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[846];
+   mapi_func _func = ((const mapi_func *) _tbl)[848];
    ((void (APIENTRY *)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubvNV)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[847];
+   mapi_func _func = ((const mapi_func *) _tbl)[849];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[848];
+   mapi_func _func = ((const mapi_func *) _tbl)[850];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[849];
+   mapi_func _func = ((const mapi_func *) _tbl)[851];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[850];
+   mapi_func _func = ((const mapi_func *) _tbl)[852];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[851];
+   mapi_func _func = ((const mapi_func *) _tbl)[853];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[852];
+   mapi_func _func = ((const mapi_func *) _tbl)[854];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[853];
+   mapi_func _func = ((const mapi_func *) _tbl)[855];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[854];
+   mapi_func _func = ((const mapi_func *) _tbl)[856];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[855];
+   mapi_func _func = ((const mapi_func *) _tbl)[857];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[856];
+   mapi_func _func = ((const mapi_func *) _tbl)[858];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[857];
+   mapi_func _func = ((const mapi_func *) _tbl)[859];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[858];
+   mapi_func _func = ((const mapi_func *) _tbl)[860];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[859];
+   mapi_func _func = ((const mapi_func *) _tbl)[861];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[860];
+   mapi_func _func = ((const mapi_func *) _tbl)[862];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[861];
+   mapi_func _func = ((const mapi_func *) _tbl)[863];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLubyte *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexBumpParameterfvATI)(GLenum pname, GLfloat *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[862];
+   mapi_func _func = ((const mapi_func *) _tbl)[864];
    ((void (APIENTRY *)(GLenum pname, GLfloat *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexBumpParameterivATI)(GLenum pname, GLint *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[863];
+   mapi_func _func = ((const mapi_func *) _tbl)[865];
    ((void (APIENTRY *)(GLenum pname, GLint *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBumpParameterfvATI)(GLenum pname, const GLfloat *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[864];
+   mapi_func _func = ((const mapi_func *) _tbl)[866];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBumpParameterivATI)(GLenum pname, const GLint *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[865];
+   mapi_func _func = ((const mapi_func *) _tbl)[867];
    ((void (APIENTRY *)(GLenum pname, const GLint *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[866];
+   mapi_func _func = ((const mapi_func *) _tbl)[868];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[867];
+   mapi_func _func = ((const mapi_func *) _tbl)[869];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[868];
+   mapi_func _func = ((const mapi_func *) _tbl)[870];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginFragmentShaderATI)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[869];
+   mapi_func _func = ((const mapi_func *) _tbl)[871];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragmentShaderATI)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[870];
+   mapi_func _func = ((const mapi_func *) _tbl)[872];
    ((void (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[871];
+   mapi_func _func = ((const mapi_func *) _tbl)[873];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[872];
+   mapi_func _func = ((const mapi_func *) _tbl)[874];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[873];
+   mapi_func _func = ((const mapi_func *) _tbl)[875];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFragmentShaderATI)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[874];
+   mapi_func _func = ((const mapi_func *) _tbl)[876];
    ((void (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndFragmentShaderATI)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[875];
+   mapi_func _func = ((const mapi_func *) _tbl)[877];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(GenFragmentShadersATI)(GLuint range)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[876];
+   mapi_func _func = ((const mapi_func *) _tbl)[878];
    return ((GLuint (APIENTRY *)(GLuint range)) _func)(range);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[877];
+   mapi_func _func = ((const mapi_func *) _tbl)[879];
    ((void (APIENTRY *)(GLuint dst, GLuint coord, GLenum swizzle)) _func)(dst, coord, swizzle);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[878];
+   mapi_func _func = ((const mapi_func *) _tbl)[880];
    ((void (APIENTRY *)(GLuint dst, GLuint interp, GLenum swizzle)) _func)(dst, interp, swizzle);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SetFragmentShaderConstantATI)(GLuint dst, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[879];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((void (APIENTRY *)(GLuint dst, const GLfloat *value)) _func)(dst, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriNV)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[880];
+   mapi_func _func = ((const mapi_func *) _tbl)[882];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteri)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[880];
+   mapi_func _func = ((const mapi_func *) _tbl)[882];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterivNV)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[881];
+   mapi_func _func = ((const mapi_func *) _tbl)[883];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriv)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[881];
+   mapi_func _func = ((const mapi_func *) _tbl)[883];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[884];
+   mapi_func _func = ((const mapi_func *) _tbl)[886];
    ((void (APIENTRY *)(GLsizei n, const GLuint *arrays)) _func)(n, arrays);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsVertexArray)(GLuint array)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[886];
+   mapi_func _func = ((const mapi_func *) _tbl)[888];
    return ((GLboolean (APIENTRY *)(GLuint array)) _func)(array);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[887];
+   mapi_func _func = ((const mapi_func *) _tbl)[889];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params)) _func)(id, len, name, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[888];
+   mapi_func _func = ((const mapi_func *) _tbl)[890];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params)) _func)(id, len, name, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[889];
+   mapi_func _func = ((const mapi_func *) _tbl)[891];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(id, len, name, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[890];
+   mapi_func _func = ((const mapi_func *) _tbl)[892];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v)) _func)(id, len, name, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[891];
+   mapi_func _func = ((const mapi_func *) _tbl)[893];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(id, len, name, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[892];
+   mapi_func _func = ((const mapi_func *) _tbl)[894];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v)) _func)(id, len, name, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndexNV)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[893];
+   mapi_func _func = ((const mapi_func *) _tbl)[895];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndex)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[893];
+   mapi_func _func = ((const mapi_func *) _tbl)[895];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[894];
+   mapi_func _func = ((const mapi_func *) _tbl)[896];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[942];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((void (APIENTRY *)(GLenum modeRGB, GLenum modeA)) _func)(modeRGB, modeA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebufferEXT)(GLenum target, GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[943];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    ((void (APIENTRY *)(GLenum target, GLuint framebuffer)) _func)(target, framebuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebuffer)(GLenum target, GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[943];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    ((void (APIENTRY *)(GLenum target, GLuint framebuffer)) _func)(target, framebuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindRenderbufferEXT)(GLenum target, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[944];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    ((void (APIENTRY *)(GLenum target, GLuint renderbuffer)) _func)(target, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindRenderbuffer)(GLenum target, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[944];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    ((void (APIENTRY *)(GLenum target, GLuint renderbuffer)) _func)(target, renderbuffer);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(CheckFramebufferStatusEXT)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    return ((GLenum (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(CheckFramebufferStatus)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    return ((GLenum (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[946];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((void (APIENTRY *)(GLsizei n, const GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFramebuffers)(GLsizei n, const GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[946];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((void (APIENTRY *)(GLsizei n, const GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteRenderbuffersEXT)(GLsizei n, const GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[947];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((void (APIENTRY *)(GLsizei n, const GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteRenderbuffers)(GLsizei n, const GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[947];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((void (APIENTRY *)(GLsizei n, const GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[948];
+   mapi_func _func = ((const mapi_func *) _tbl)[950];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) _func)(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[948];
+   mapi_func _func = ((const mapi_func *) _tbl)[950];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) _func)(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[949];
+   mapi_func _func = ((const mapi_func *) _tbl)[951];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[949];
+   mapi_func _func = ((const mapi_func *) _tbl)[951];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[950];
+   mapi_func _func = ((const mapi_func *) _tbl)[952];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[950];
+   mapi_func _func = ((const mapi_func *) _tbl)[952];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) _func)(target, attachment, textarget, texture, level, zoffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) _func)(target, attachment, textarget, texture, level, zoffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenFramebuffersEXT)(GLsizei n, GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    ((void (APIENTRY *)(GLsizei n, GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenFramebuffers)(GLsizei n, GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    ((void (APIENTRY *)(GLsizei n, GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenRenderbuffersEXT)(GLsizei n, GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[953];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    ((void (APIENTRY *)(GLsizei n, GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenRenderbuffers)(GLsizei n, GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[953];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    ((void (APIENTRY *)(GLsizei n, GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenerateMipmapEXT)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[954];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenerateMipmap)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[954];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[955];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum pname, GLint *params)) _func)(target, attachment, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[955];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum pname, GLint *params)) _func)(target, attachment, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[956];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[956];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsFramebufferEXT)(GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[957];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    return ((GLboolean (APIENTRY *)(GLuint framebuffer)) _func)(framebuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsFramebuffer)(GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[957];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    return ((GLboolean (APIENTRY *)(GLuint framebuffer)) _func)(framebuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbufferEXT)(GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[958];
+   mapi_func _func = ((const mapi_func *) _tbl)[960];
    return ((GLboolean (APIENTRY *)(GLuint renderbuffer)) _func)(renderbuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbuffer)(GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[958];
+   mapi_func _func = ((const mapi_func *) _tbl)[960];
    return ((GLboolean (APIENTRY *)(GLuint renderbuffer)) _func)(renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[959];
+   mapi_func _func = ((const mapi_func *) _tbl)[961];
    ((void (APIENTRY *)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[959];
+   mapi_func _func = ((const mapi_func *) _tbl)[961];
    ((void (APIENTRY *)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[960];
+   mapi_func _func = ((const mapi_func *) _tbl)[962];
    ((void (APIENTRY *)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)) _func)(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[963];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[963];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocationEXT)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[964];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocation)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[964];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformuivEXT)(GLuint program, GLint location, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[965];
+   mapi_func _func = ((const mapi_func *) _tbl)[967];
    ((void (APIENTRY *)(GLuint program, GLint location, GLuint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformuiv)(GLuint program, GLint location, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[965];
+   mapi_func _func = ((const mapi_func *) _tbl)[967];
    ((void (APIENTRY *)(GLuint program, GLint location, GLuint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[966];
+   mapi_func _func = ((const mapi_func *) _tbl)[968];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIiv)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[966];
+   mapi_func _func = ((const mapi_func *) _tbl)[968];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[967];
+   mapi_func _func = ((const mapi_func *) _tbl)[969];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLuint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[967];
+   mapi_func _func = ((const mapi_func *) _tbl)[969];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLuint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uiEXT)(GLint location, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[968];
+   mapi_func _func = ((const mapi_func *) _tbl)[970];
    ((void (APIENTRY *)(GLint location, GLuint x)) _func)(location, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1ui)(GLint location, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[968];
+   mapi_func _func = ((const mapi_func *) _tbl)[970];
    ((void (APIENTRY *)(GLint location, GLuint x)) _func)(location, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[969];
+   mapi_func _func = ((const mapi_func *) _tbl)[971];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[969];
+   mapi_func _func = ((const mapi_func *) _tbl)[971];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uiEXT)(GLint location, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[970];
+   mapi_func _func = ((const mapi_func *) _tbl)[972];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y)) _func)(location, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2ui)(GLint location, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[970];
+   mapi_func _func = ((const mapi_func *) _tbl)[972];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y)) _func)(location, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[971];
+   mapi_func _func = ((const mapi_func *) _tbl)[973];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[971];
+   mapi_func _func = ((const mapi_func *) _tbl)[973];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[972];
+   mapi_func _func = ((const mapi_func *) _tbl)[974];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z)) _func)(location, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3ui)(GLint location, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[972];
+   mapi_func _func = ((const mapi_func *) _tbl)[974];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z)) _func)(location, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[973];
+   mapi_func _func = ((const mapi_func *) _tbl)[975];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[973];
+   mapi_func _func = ((const mapi_func *) _tbl)[975];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[974];
+   mapi_func _func = ((const mapi_func *) _tbl)[976];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(location, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4ui)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[974];
+   mapi_func _func = ((const mapi_func *) _tbl)[976];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(location, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[975];
+   mapi_func _func = ((const mapi_func *) _tbl)[977];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[975];
+   mapi_func _func = ((const mapi_func *) _tbl)[977];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1iEXT)(GLuint index, GLint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[976];
+   mapi_func _func = ((const mapi_func *) _tbl)[978];
    ((void (APIENTRY *)(GLuint index, GLint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1i)(GLuint index, GLint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[976];
+   mapi_func _func = ((const mapi_func *) _tbl)[978];
    ((void (APIENTRY *)(GLuint index, GLint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[977];
+   mapi_func _func = ((const mapi_func *) _tbl)[979];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[977];
+   mapi_func _func = ((const mapi_func *) _tbl)[979];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uiEXT)(GLuint index, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[978];
+   mapi_func _func = ((const mapi_func *) _tbl)[980];
    ((void (APIENTRY *)(GLuint index, GLuint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1ui)(GLuint index, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[978];
+   mapi_func _func = ((const mapi_func *) _tbl)[980];
    ((void (APIENTRY *)(GLuint index, GLuint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[979];
+   mapi_func _func = ((const mapi_func *) _tbl)[981];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[979];
+   mapi_func _func = ((const mapi_func *) _tbl)[981];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2iEXT)(GLuint index, GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[980];
+   mapi_func _func = ((const mapi_func *) _tbl)[982];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2i)(GLuint index, GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[980];
+   mapi_func _func = ((const mapi_func *) _tbl)[982];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[981];
+   mapi_func _func = ((const mapi_func *) _tbl)[983];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[981];
+   mapi_func _func = ((const mapi_func *) _tbl)[983];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[982];
+   mapi_func _func = ((const mapi_func *) _tbl)[984];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[982];
+   mapi_func _func = ((const mapi_func *) _tbl)[984];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[983];
+   mapi_func _func = ((const mapi_func *) _tbl)[985];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[983];
+   mapi_func _func = ((const mapi_func *) _tbl)[985];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[984];
+   mapi_func _func = ((const mapi_func *) _tbl)[986];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[984];
+   mapi_func _func = ((const mapi_func *) _tbl)[986];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[985];
+   mapi_func _func = ((const mapi_func *) _tbl)[987];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[985];
+   mapi_func _func = ((const mapi_func *) _tbl)[987];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[986];
+   mapi_func _func = ((const mapi_func *) _tbl)[988];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[986];
+   mapi_func _func = ((const mapi_func *) _tbl)[988];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[987];
+   mapi_func _func = ((const mapi_func *) _tbl)[989];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[987];
+   mapi_func _func = ((const mapi_func *) _tbl)[989];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4bvEXT)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[988];
+   mapi_func _func = ((const mapi_func *) _tbl)[990];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4bv)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[988];
+   mapi_func _func = ((const mapi_func *) _tbl)[990];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[989];
+   mapi_func _func = ((const mapi_func *) _tbl)[991];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z, GLint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[989];
+   mapi_func _func = ((const mapi_func *) _tbl)[991];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z, GLint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[990];
+   mapi_func _func = ((const mapi_func *) _tbl)[992];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[990];
+   mapi_func _func = ((const mapi_func *) _tbl)[992];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4svEXT)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[991];
+   mapi_func _func = ((const mapi_func *) _tbl)[993];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[991];
+   mapi_func _func = ((const mapi_func *) _tbl)[993];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ubvEXT)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[992];
+   mapi_func _func = ((const mapi_func *) _tbl)[994];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ubv)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[992];
+   mapi_func _func = ((const mapi_func *) _tbl)[994];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[995];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[995];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[994];
+   mapi_func _func = ((const mapi_func *) _tbl)[996];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[994];
+   mapi_func _func = ((const mapi_func *) _tbl)[996];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4usvEXT)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[995];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4usv)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[995];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[996];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[996];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayerARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[998];
+   mapi_func _func = ((const mapi_func *) _tbl)[1000];
    ((void (APIENTRY *)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) _func)(buf, r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorMaski)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[998];
+   mapi_func _func = ((const mapi_func *) _tbl)[1000];
    ((void (APIENTRY *)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) _func)(buf, r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DisableIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[1001];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Disablei)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[1001];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EnableIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1000];
+   mapi_func _func = ((const mapi_func *) _tbl)[1002];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Enablei)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1000];
+   mapi_func _func = ((const mapi_func *) _tbl)[1002];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1001];
+   mapi_func _func = ((const mapi_func *) _tbl)[1003];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLboolean *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBooleani_v)(GLenum value, GLuint index, GLboolean *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1001];
+   mapi_func _func = ((const mapi_func *) _tbl)[1003];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLboolean *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1002];
+   mapi_func _func = ((const mapi_func *) _tbl)[1004];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLint *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetIntegeri_v)(GLenum value, GLuint index, GLint *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1002];
+   mapi_func _func = ((const mapi_func *) _tbl)[1004];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLint *data)) _func)(value, index, data);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsEnabledIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1003];
+   mapi_func _func = ((const mapi_func *) _tbl)[1005];
    return ((GLboolean (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsEnabledi)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1003];
+   mapi_func _func = ((const mapi_func *) _tbl)[1005];
    return ((GLboolean (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1004];
+   mapi_func _func = ((const mapi_func *) _tbl)[1006];
    ((void (APIENTRY *)(GLint r, GLint g, GLint b, GLint a)) _func)(r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1005];
+   mapi_func _func = ((const mapi_func *) _tbl)[1007];
    ((void (APIENTRY *)(GLuint r, GLuint g, GLuint b, GLuint a)) _func)(r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1006];
+   mapi_func _func = ((const mapi_func *) _tbl)[1008];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIiv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1006];
+   mapi_func _func = ((const mapi_func *) _tbl)[1008];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1007];
+   mapi_func _func = ((const mapi_func *) _tbl)[1009];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIuiv)(GLenum target, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1007];
+   mapi_func _func = ((const mapi_func *) _tbl)[1009];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIivEXT)(GLenum target, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1008];
+   mapi_func _func = ((const mapi_func *) _tbl)[1010];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIiv)(GLenum target, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1008];
+   mapi_func _func = ((const mapi_func *) _tbl)[1010];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1009];
+   mapi_func _func = ((const mapi_func *) _tbl)[1011];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIuiv)(GLenum target, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1009];
+   mapi_func _func = ((const mapi_func *) _tbl)[1011];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginConditionalRenderNV)(GLuint query, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1010];
+   mapi_func _func = ((const mapi_func *) _tbl)[1012];
    ((void (APIENTRY *)(GLuint query, GLenum mode)) _func)(query, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginConditionalRender)(GLuint query, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1010];
+   mapi_func _func = ((const mapi_func *) _tbl)[1012];
    ((void (APIENTRY *)(GLuint query, GLenum mode)) _func)(query, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndConditionalRenderNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1011];
+   mapi_func _func = ((const mapi_func *) _tbl)[1013];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndConditionalRender)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1011];
+   mapi_func _func = ((const mapi_func *) _tbl)[1013];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginTransformFeedbackEXT)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1012];
+   mapi_func _func = ((const mapi_func *) _tbl)[1014];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginTransformFeedback)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1012];
+   mapi_func _func = ((const mapi_func *) _tbl)[1014];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1013];
+   mapi_func _func = ((const mapi_func *) _tbl)[1015];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer)) _func)(target, index, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferBase)(GLenum target, GLuint index, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1013];
+   mapi_func _func = ((const mapi_func *) _tbl)[1015];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer)) _func)(target, index, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1014];
+   mapi_func _func = ((const mapi_func *) _tbl)[1016];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)) _func)(target, index, buffer, offset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1015];
+   mapi_func _func = ((const mapi_func *) _tbl)[1017];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1015];
+   mapi_func _func = ((const mapi_func *) _tbl)[1017];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndTransformFeedbackEXT)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1016];
+   mapi_func _func = ((const mapi_func *) _tbl)[1018];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1016];
+   mapi_func _func = ((const mapi_func *) _tbl)[1018];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1017];
+   mapi_func _func = ((const mapi_func *) _tbl)[1019];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1017];
+   mapi_func _func = ((const mapi_func *) _tbl)[1019];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char **varyings, GLenum bufferMode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1018];
+   mapi_func _func = ((const mapi_func *) _tbl)[1020];
    ((void (APIENTRY *)(GLuint program, GLsizei count, const char **varyings, GLenum bufferMode)) _func)(program, count, varyings, bufferMode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1018];
+   mapi_func _func = ((const mapi_func *) _tbl)[1020];
    ((void (APIENTRY *)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode)) _func)(program, count, varyings, bufferMode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertexEXT)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1019];
+   mapi_func _func = ((const mapi_func *) _tbl)[1021];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertex)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1019];
+   mapi_func _func = ((const mapi_func *) _tbl)[1021];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1022];
+   mapi_func _func = ((const mapi_func *) _tbl)[1024];
    ((void (APIENTRY *)(GLenum objectType, GLuint name, GLenum pname, GLint *value)) _func)(objectType, name, pname, value);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1023];
+   mapi_func _func = ((const mapi_func *) _tbl)[1025];
    return ((GLenum (APIENTRY *)(GLenum objectType, GLuint name, GLenum option)) _func)(objectType, name, option);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1024];
+   mapi_func _func = ((const mapi_func *) _tbl)[1026];
    return ((GLenum (APIENTRY *)(GLenum objectType, GLuint name, GLenum option)) _func)(objectType, name, option);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ActiveProgramEXT)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1025];
+   mapi_func _func = ((const mapi_func *) _tbl)[1027];
    ((void (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(CreateShaderProgramEXT)(GLenum type, const GLchar *string)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1026];
+   mapi_func _func = ((const mapi_func *) _tbl)[1028];
    return ((GLuint (APIENTRY *)(GLenum type, const GLchar *string)) _func)(type, string);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UseShaderProgramEXT)(GLenum type, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1027];
+   mapi_func _func = ((const mapi_func *) _tbl)[1029];
    ((void (APIENTRY *)(GLenum type, GLuint program)) _func)(type, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureBarrierNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1028];
+   mapi_func _func = ((const mapi_func *) _tbl)[1030];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid *writeOffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1034];
+   mapi_func _func = ((const mapi_func *) _tbl)[1036];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetTexture2DOES)(GLenum target, GLvoid *writeOffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1035];
+   mapi_func _func = ((const mapi_func *) _tbl)[1037];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
@@ -12651,311 +12667,317 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFunciARB))"\n"
 ".globl "GLAPI_PREFIX_STR(BlendFuncIndexedAMD)"\n"
 ".set "GLAPI_PREFIX_STR(BlendFuncIndexedAMD)", "GLAPI_PREFIX_STR(BlendFunciARB)"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindSampler))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragDataLocationIndexed))"\n"
 "\t"STUB_ASM_CODE("601")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteSamplers))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFragDataIndex))"\n"
 "\t"STUB_ASM_CODE("602")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenSamplers))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindSampler))"\n"
 "\t"STUB_ASM_CODE("603")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteSamplers))"\n"
 "\t"STUB_ASM_CODE("604")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIuiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenSamplers))"\n"
 "\t"STUB_ASM_CODE("605")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterfv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIiv))"\n"
 "\t"STUB_ASM_CODE("606")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameteriv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIuiv))"\n"
 "\t"STUB_ASM_CODE("607")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsSampler))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterfv))"\n"
 "\t"STUB_ASM_CODE("608")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameteriv))"\n"
 "\t"STUB_ASM_CODE("609")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIuiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsSampler))"\n"
 "\t"STUB_ASM_CODE("610")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterf))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIiv))"\n"
 "\t"STUB_ASM_CODE("611")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterfv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIuiv))"\n"
 "\t"STUB_ASM_CODE("612")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteri))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterf))"\n"
 "\t"STUB_ASM_CODE("613")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteriv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterfv))"\n"
 "\t"STUB_ASM_CODE("614")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteri))"\n"
 "\t"STUB_ASM_CODE("615")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteriv))"\n"
 "\t"STUB_ASM_CODE("616")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP4ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP3ui))"\n"
 "\t"STUB_ASM_CODE("617")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP4uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP3uiv))"\n"
 "\t"STUB_ASM_CODE("618")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP1ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP4ui))"\n"
 "\t"STUB_ASM_CODE("619")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP1uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP4uiv))"\n"
 "\t"STUB_ASM_CODE("620")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP2ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP1ui))"\n"
 "\t"STUB_ASM_CODE("621")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP2uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP1uiv))"\n"
 "\t"STUB_ASM_CODE("622")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP2ui))"\n"
 "\t"STUB_ASM_CODE("623")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP2uiv))"\n"
 "\t"STUB_ASM_CODE("624")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP4ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP3ui))"\n"
 "\t"STUB_ASM_CODE("625")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP4uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP3uiv))"\n"
 "\t"STUB_ASM_CODE("626")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP4ui))"\n"
 "\t"STUB_ASM_CODE("627")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP4uiv))"\n"
 "\t"STUB_ASM_CODE("628")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalP3ui))"\n"
 "\t"STUB_ASM_CODE("629")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalP3uiv))"\n"
 "\t"STUB_ASM_CODE("630")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP1ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorP3ui))"\n"
 "\t"STUB_ASM_CODE("631")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP1uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorP3uiv))"\n"
 "\t"STUB_ASM_CODE("632")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP2ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP1ui))"\n"
 "\t"STUB_ASM_CODE("633")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP2uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP1uiv))"\n"
 "\t"STUB_ASM_CODE("634")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP2ui))"\n"
 "\t"STUB_ASM_CODE("635")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP2uiv))"\n"
 "\t"STUB_ASM_CODE("636")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP4ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP3ui))"\n"
 "\t"STUB_ASM_CODE("637")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP4uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP3uiv))"\n"
 "\t"STUB_ASM_CODE("638")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP1ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP4ui))"\n"
 "\t"STUB_ASM_CODE("639")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP1uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP4uiv))"\n"
 "\t"STUB_ASM_CODE("640")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP2ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP1ui))"\n"
 "\t"STUB_ASM_CODE("641")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP2uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP1uiv))"\n"
 "\t"STUB_ASM_CODE("642")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP2ui))"\n"
 "\t"STUB_ASM_CODE("643")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP2uiv))"\n"
 "\t"STUB_ASM_CODE("644")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP4ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP3ui))"\n"
 "\t"STUB_ASM_CODE("645")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP4uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP3uiv))"\n"
 "\t"STUB_ASM_CODE("646")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP2ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP4ui))"\n"
 "\t"STUB_ASM_CODE("647")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP2uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP4uiv))"\n"
 "\t"STUB_ASM_CODE("648")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP3ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP2ui))"\n"
 "\t"STUB_ASM_CODE("649")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP3uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP2uiv))"\n"
 "\t"STUB_ASM_CODE("650")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP4ui))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP3ui))"\n"
 "\t"STUB_ASM_CODE("651")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP4uiv))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP3uiv))"\n"
 "\t"STUB_ASM_CODE("652")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP4ui))"\n"
 "\t"STUB_ASM_CODE("653")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteTransformFeedbacks))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP4uiv))"\n"
 "\t"STUB_ASM_CODE("654")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindTransformFeedback))"\n"
 "\t"STUB_ASM_CODE("655")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenTransformFeedbacks))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteTransformFeedbacks))"\n"
 "\t"STUB_ASM_CODE("656")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawTransformFeedback))"\n"
 "\t"STUB_ASM_CODE("657")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PauseTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenTransformFeedbacks))"\n"
 "\t"STUB_ASM_CODE("658")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResumeTransformFeedback))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsTransformFeedback))"\n"
 "\t"STUB_ASM_CODE("659")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearDepthf))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PauseTransformFeedback))"\n"
 "\t"STUB_ASM_CODE("660")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DepthRangef))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResumeTransformFeedback))"\n"
 "\t"STUB_ASM_CODE("661")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetShaderPrecisionFormat))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearDepthf))"\n"
 "\t"STUB_ASM_CODE("662")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReleaseShaderCompiler))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DepthRangef))"\n"
 "\t"STUB_ASM_CODE("663")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderBinary))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetShaderPrecisionFormat))"\n"
 "\t"STUB_ASM_CODE("664")"\n"
 
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReleaseShaderCompiler))"\n"
+"\t"STUB_ASM_CODE("665")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderBinary))"\n"
+"\t"STUB_ASM_CODE("666")"\n"
+
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageCallbackARB))"\n"
-"\t"STUB_ASM_CODE("668")"\n"
+"\t"STUB_ASM_CODE("670")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageControlARB))"\n"
-"\t"STUB_ASM_CODE("669")"\n"
+"\t"STUB_ASM_CODE("671")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageInsertARB))"\n"
-"\t"STUB_ASM_CODE("670")"\n"
+"\t"STUB_ASM_CODE("672")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetDebugMessageLogARB))"\n"
-"\t"STUB_ASM_CODE("671")"\n"
+"\t"STUB_ASM_CODE("673")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetGraphicsResetStatusARB))"\n"
-"\t"STUB_ASM_CODE("672")"\n"
+"\t"STUB_ASM_CODE("674")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnColorTableARB))"\n"
-"\t"STUB_ASM_CODE("673")"\n"
+"\t"STUB_ASM_CODE("675")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnCompressedTexImageARB))"\n"
-"\t"STUB_ASM_CODE("674")"\n"
+"\t"STUB_ASM_CODE("676")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnConvolutionFilterARB))"\n"
-"\t"STUB_ASM_CODE("675")"\n"
+"\t"STUB_ASM_CODE("677")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnHistogramARB))"\n"
-"\t"STUB_ASM_CODE("676")"\n"
+"\t"STUB_ASM_CODE("678")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapdvARB))"\n"
-"\t"STUB_ASM_CODE("677")"\n"
+"\t"STUB_ASM_CODE("679")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapfvARB))"\n"
-"\t"STUB_ASM_CODE("678")"\n"
+"\t"STUB_ASM_CODE("680")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapivARB))"\n"
-"\t"STUB_ASM_CODE("679")"\n"
+"\t"STUB_ASM_CODE("681")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMinmaxARB))"\n"
-"\t"STUB_ASM_CODE("680")"\n"
+"\t"STUB_ASM_CODE("682")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapfvARB))"\n"
-"\t"STUB_ASM_CODE("681")"\n"
+"\t"STUB_ASM_CODE("683")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapuivARB))"\n"
-"\t"STUB_ASM_CODE("682")"\n"
+"\t"STUB_ASM_CODE("684")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapusvARB))"\n"
-"\t"STUB_ASM_CODE("683")"\n"
+"\t"STUB_ASM_CODE("685")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPolygonStippleARB))"\n"
-"\t"STUB_ASM_CODE("684")"\n"
+"\t"STUB_ASM_CODE("686")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnSeparableFilterARB))"\n"
-"\t"STUB_ASM_CODE("685")"\n"
+"\t"STUB_ASM_CODE("687")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnTexImageARB))"\n"
-"\t"STUB_ASM_CODE("686")"\n"
+"\t"STUB_ASM_CODE("688")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformdvARB))"\n"
-"\t"STUB_ASM_CODE("687")"\n"
+"\t"STUB_ASM_CODE("689")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformfvARB))"\n"
-"\t"STUB_ASM_CODE("688")"\n"
+"\t"STUB_ASM_CODE("690")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformivARB))"\n"
-"\t"STUB_ASM_CODE("689")"\n"
+"\t"STUB_ASM_CODE("691")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformuivARB))"\n"
-"\t"STUB_ASM_CODE("690")"\n"
+"\t"STUB_ASM_CODE("692")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReadnPixelsARB))"\n"
-"\t"STUB_ASM_CODE("691")"\n"
+"\t"STUB_ASM_CODE("693")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage1D))"\n"
-"\t"STUB_ASM_CODE("692")"\n"
+"\t"STUB_ASM_CODE("694")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage2D))"\n"
-"\t"STUB_ASM_CODE("693")"\n"
+"\t"STUB_ASM_CODE("695")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage3D))"\n"
-"\t"STUB_ASM_CODE("694")"\n"
+"\t"STUB_ASM_CODE("696")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage1DEXT))"\n"
-"\t"STUB_ASM_CODE("695")"\n"
+"\t"STUB_ASM_CODE("697")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage2DEXT))"\n"
-"\t"STUB_ASM_CODE("696")"\n"
+"\t"STUB_ASM_CODE("698")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage3DEXT))"\n"
-"\t"STUB_ASM_CODE("697")"\n"
+"\t"STUB_ASM_CODE("699")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PolygonOffsetEXT))"\n"
-"\t"STUB_ASM_CODE("698")"\n"
+"\t"STUB_ASM_CODE("700")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("717")"\n"
+"\t"STUB_ASM_CODE("719")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EdgeFlagPointerEXT))"\n"
-"\t"STUB_ASM_CODE("718")"\n"
+"\t"STUB_ASM_CODE("720")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IndexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("719")"\n"
+"\t"STUB_ASM_CODE("721")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalPointerEXT))"\n"
-"\t"STUB_ASM_CODE("720")"\n"
+"\t"STUB_ASM_CODE("722")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("721")"\n"
+"\t"STUB_ASM_CODE("723")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("722")"\n"
+"\t"STUB_ASM_CODE("724")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
-"\t"STUB_ASM_CODE("723")"\n"
+"\t"STUB_ASM_CODE("725")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterf)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterf)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
@@ -12964,7 +12986,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfARB)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfvEXT))"\n"
-"\t"STUB_ASM_CODE("724")"\n"
+"\t"STUB_ASM_CODE("726")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterfv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfv)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
@@ -12973,211 +12995,211 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfvEXT))"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfvARB)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("725")"\n"
+"\t"STUB_ASM_CODE("727")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UnlockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("726")"\n"
+"\t"STUB_ASM_CODE("728")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bEXT))"\n"
-"\t"STUB_ASM_CODE("727")"\n"
+"\t"STUB_ASM_CODE("729")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3b)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3b)", "GLAPI_PREFIX_STR(SecondaryColor3bEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bvEXT))"\n"
-"\t"STUB_ASM_CODE("728")"\n"
+"\t"STUB_ASM_CODE("730")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3bv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3bv)", "GLAPI_PREFIX_STR(SecondaryColor3bvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3dEXT))"\n"
-"\t"STUB_ASM_CODE("729")"\n"
+"\t"STUB_ASM_CODE("731")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3d)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3d)", "GLAPI_PREFIX_STR(SecondaryColor3dEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3dvEXT))"\n"
-"\t"STUB_ASM_CODE("730")"\n"
+"\t"STUB_ASM_CODE("732")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3dv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3dv)", "GLAPI_PREFIX_STR(SecondaryColor3dvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3fEXT))"\n"
-"\t"STUB_ASM_CODE("731")"\n"
+"\t"STUB_ASM_CODE("733")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3f)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3f)", "GLAPI_PREFIX_STR(SecondaryColor3fEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3fvEXT))"\n"
-"\t"STUB_ASM_CODE("732")"\n"
+"\t"STUB_ASM_CODE("734")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3fv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3fv)", "GLAPI_PREFIX_STR(SecondaryColor3fvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3iEXT))"\n"
-"\t"STUB_ASM_CODE("733")"\n"
+"\t"STUB_ASM_CODE("735")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3i)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3i)", "GLAPI_PREFIX_STR(SecondaryColor3iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ivEXT))"\n"
-"\t"STUB_ASM_CODE("734")"\n"
+"\t"STUB_ASM_CODE("736")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3iv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3iv)", "GLAPI_PREFIX_STR(SecondaryColor3ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3sEXT))"\n"
-"\t"STUB_ASM_CODE("735")"\n"
+"\t"STUB_ASM_CODE("737")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3s)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3s)", "GLAPI_PREFIX_STR(SecondaryColor3sEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3svEXT))"\n"
-"\t"STUB_ASM_CODE("736")"\n"
+"\t"STUB_ASM_CODE("738")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3sv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3sv)", "GLAPI_PREFIX_STR(SecondaryColor3svEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ubEXT))"\n"
-"\t"STUB_ASM_CODE("737")"\n"
+"\t"STUB_ASM_CODE("739")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ub)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ub)", "GLAPI_PREFIX_STR(SecondaryColor3ubEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ubvEXT))"\n"
-"\t"STUB_ASM_CODE("738")"\n"
+"\t"STUB_ASM_CODE("740")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ubv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ubv)", "GLAPI_PREFIX_STR(SecondaryColor3ubvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3uiEXT))"\n"
-"\t"STUB_ASM_CODE("739")"\n"
+"\t"STUB_ASM_CODE("741")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ui)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ui)", "GLAPI_PREFIX_STR(SecondaryColor3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3uivEXT))"\n"
-"\t"STUB_ASM_CODE("740")"\n"
+"\t"STUB_ASM_CODE("742")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3uiv)", "GLAPI_PREFIX_STR(SecondaryColor3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3usEXT))"\n"
-"\t"STUB_ASM_CODE("741")"\n"
+"\t"STUB_ASM_CODE("743")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3us)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3us)", "GLAPI_PREFIX_STR(SecondaryColor3usEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3usvEXT))"\n"
-"\t"STUB_ASM_CODE("742")"\n"
+"\t"STUB_ASM_CODE("744")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3usv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3usv)", "GLAPI_PREFIX_STR(SecondaryColor3usvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("743")"\n"
+"\t"STUB_ASM_CODE("745")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColorPointer)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColorPointer)", "GLAPI_PREFIX_STR(SecondaryColorPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawArraysEXT))"\n"
-"\t"STUB_ASM_CODE("744")"\n"
+"\t"STUB_ASM_CODE("746")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultiDrawArrays)"\n"
 ".set "GLAPI_PREFIX_STR(MultiDrawArrays)", "GLAPI_PREFIX_STR(MultiDrawArraysEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawElementsEXT))"\n"
-"\t"STUB_ASM_CODE("745")"\n"
+"\t"STUB_ASM_CODE("747")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultiDrawElements)"\n"
 ".set "GLAPI_PREFIX_STR(MultiDrawElements)", "GLAPI_PREFIX_STR(MultiDrawElementsEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("746")"\n"
+"\t"STUB_ASM_CODE("748")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordPointer)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordPointer)", "GLAPI_PREFIX_STR(FogCoordPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoorddEXT))"\n"
-"\t"STUB_ASM_CODE("747")"\n"
+"\t"STUB_ASM_CODE("749")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordd)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordd)", "GLAPI_PREFIX_STR(FogCoorddEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoorddvEXT))"\n"
-"\t"STUB_ASM_CODE("748")"\n"
+"\t"STUB_ASM_CODE("750")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoorddv)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoorddv)", "GLAPI_PREFIX_STR(FogCoorddvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordfEXT))"\n"
-"\t"STUB_ASM_CODE("749")"\n"
+"\t"STUB_ASM_CODE("751")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordf)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordf)", "GLAPI_PREFIX_STR(FogCoordfEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordfvEXT))"\n"
-"\t"STUB_ASM_CODE("750")"\n"
+"\t"STUB_ASM_CODE("752")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordfv)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordfv)", "GLAPI_PREFIX_STR(FogCoordfvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFuncSeparateEXT))"\n"
-"\t"STUB_ASM_CODE("752")"\n"
+"\t"STUB_ASM_CODE("754")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendFuncSeparate)"\n"
 ".set "GLAPI_PREFIX_STR(BlendFuncSeparate)", "GLAPI_PREFIX_STR(BlendFuncSeparateEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FlushVertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("753")"\n"
+"\t"STUB_ASM_CODE("755")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("754")"\n"
+"\t"STUB_ASM_CODE("756")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("755")"\n"
+"\t"STUB_ASM_CODE("757")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerOutputNV))"\n"
-"\t"STUB_ASM_CODE("756")"\n"
+"\t"STUB_ASM_CODE("758")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfNV))"\n"
-"\t"STUB_ASM_CODE("757")"\n"
+"\t"STUB_ASM_CODE("759")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("758")"\n"
+"\t"STUB_ASM_CODE("760")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameteriNV))"\n"
-"\t"STUB_ASM_CODE("759")"\n"
+"\t"STUB_ASM_CODE("761")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterivNV))"\n"
-"\t"STUB_ASM_CODE("760")"\n"
+"\t"STUB_ASM_CODE("762")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FinalCombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("761")"\n"
+"\t"STUB_ASM_CODE("763")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("762")"\n"
+"\t"STUB_ASM_CODE("764")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("763")"\n"
+"\t"STUB_ASM_CODE("765")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("764")"\n"
+"\t"STUB_ASM_CODE("766")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("765")"\n"
+"\t"STUB_ASM_CODE("767")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("766")"\n"
+"\t"STUB_ASM_CODE("768")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("767")"\n"
+"\t"STUB_ASM_CODE("769")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResizeBuffersMESA))"\n"
-"\t"STUB_ASM_CODE("768")"\n"
+"\t"STUB_ASM_CODE("770")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
-"\t"STUB_ASM_CODE("769")"\n"
+"\t"STUB_ASM_CODE("771")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2d)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
@@ -13186,7 +13208,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dARB)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dvMESA))"\n"
-"\t"STUB_ASM_CODE("770")"\n"
+"\t"STUB_ASM_CODE("772")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dv)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
@@ -13195,7 +13217,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dvARB)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fMESA))"\n"
-"\t"STUB_ASM_CODE("771")"\n"
+"\t"STUB_ASM_CODE("773")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2f)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
@@ -13204,7 +13226,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fARB)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fvMESA))"\n"
-"\t"STUB_ASM_CODE("772")"\n"
+"\t"STUB_ASM_CODE("774")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fv)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
@@ -13213,7 +13235,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fvARB)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2iMESA))"\n"
-"\t"STUB_ASM_CODE("773")"\n"
+"\t"STUB_ASM_CODE("775")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2i)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
@@ -13222,7 +13244,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2iMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iARB)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2ivMESA))"\n"
-"\t"STUB_ASM_CODE("774")"\n"
+"\t"STUB_ASM_CODE("776")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iv)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
@@ -13231,7 +13253,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2ivMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2ivARB)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2sMESA))"\n"
-"\t"STUB_ASM_CODE("775")"\n"
+"\t"STUB_ASM_CODE("777")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2s)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
@@ -13240,7 +13262,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2sMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sARB)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2svMESA))"\n"
-"\t"STUB_ASM_CODE("776")"\n"
+"\t"STUB_ASM_CODE("778")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sv)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
@@ -13249,7 +13271,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2svMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2svARB)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dMESA))"\n"
-"\t"STUB_ASM_CODE("777")"\n"
+"\t"STUB_ASM_CODE("779")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3d)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
@@ -13258,7 +13280,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dARB)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dvMESA))"\n"
-"\t"STUB_ASM_CODE("778")"\n"
+"\t"STUB_ASM_CODE("780")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dv)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
@@ -13267,7 +13289,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dvARB)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fMESA))"\n"
-"\t"STUB_ASM_CODE("779")"\n"
+"\t"STUB_ASM_CODE("781")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3f)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
@@ -13276,7 +13298,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fARB)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fvMESA))"\n"
-"\t"STUB_ASM_CODE("780")"\n"
+"\t"STUB_ASM_CODE("782")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fv)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
@@ -13285,7 +13307,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fvARB)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3iMESA))"\n"
-"\t"STUB_ASM_CODE("781")"\n"
+"\t"STUB_ASM_CODE("783")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3i)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
@@ -13294,7 +13316,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3iMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iARB)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3ivMESA))"\n"
-"\t"STUB_ASM_CODE("782")"\n"
+"\t"STUB_ASM_CODE("784")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iv)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
@@ -13303,7 +13325,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3ivMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3ivARB)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3sMESA))"\n"
-"\t"STUB_ASM_CODE("783")"\n"
+"\t"STUB_ASM_CODE("785")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3s)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
@@ -13312,7 +13334,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3sMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sARB)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3svMESA))"\n"
-"\t"STUB_ASM_CODE("784")"\n"
+"\t"STUB_ASM_CODE("786")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sv)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
@@ -13321,70 +13343,70 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3svMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3svARB)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dMESA))"\n"
-"\t"STUB_ASM_CODE("785")"\n"
+"\t"STUB_ASM_CODE("787")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dvMESA))"\n"
-"\t"STUB_ASM_CODE("786")"\n"
+"\t"STUB_ASM_CODE("788")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fMESA))"\n"
-"\t"STUB_ASM_CODE("787")"\n"
+"\t"STUB_ASM_CODE("789")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fvMESA))"\n"
-"\t"STUB_ASM_CODE("788")"\n"
+"\t"STUB_ASM_CODE("790")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4iMESA))"\n"
-"\t"STUB_ASM_CODE("789")"\n"
+"\t"STUB_ASM_CODE("791")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4ivMESA))"\n"
-"\t"STUB_ASM_CODE("790")"\n"
+"\t"STUB_ASM_CODE("792")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4sMESA))"\n"
-"\t"STUB_ASM_CODE("791")"\n"
+"\t"STUB_ASM_CODE("793")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4svMESA))"\n"
-"\t"STUB_ASM_CODE("792")"\n"
+"\t"STUB_ASM_CODE("794")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AreProgramsResidentNV))"\n"
-"\t"STUB_ASM_CODE("802")"\n"
+"\t"STUB_ASM_CODE("804")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindProgramNV))"\n"
-"\t"STUB_ASM_CODE("803")"\n"
+"\t"STUB_ASM_CODE("805")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindProgramARB)"\n"
 ".set "GLAPI_PREFIX_STR(BindProgramARB)", "GLAPI_PREFIX_STR(BindProgramNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteProgramsNV))"\n"
-"\t"STUB_ASM_CODE("804")"\n"
+"\t"STUB_ASM_CODE("806")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteProgramsARB)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteProgramsARB)", "GLAPI_PREFIX_STR(DeleteProgramsNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ExecuteProgramNV))"\n"
-"\t"STUB_ASM_CODE("805")"\n"
+"\t"STUB_ASM_CODE("807")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenProgramsNV))"\n"
-"\t"STUB_ASM_CODE("806")"\n"
+"\t"STUB_ASM_CODE("808")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenProgramsARB)"\n"
 ".set "GLAPI_PREFIX_STR(GenProgramsARB)", "GLAPI_PREFIX_STR(GenProgramsNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("807")"\n"
+"\t"STUB_ASM_CODE("809")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("808")"\n"
+"\t"STUB_ASM_CODE("810")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramStringNV))"\n"
-"\t"STUB_ASM_CODE("809")"\n"
+"\t"STUB_ASM_CODE("811")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramivNV))"\n"
-"\t"STUB_ASM_CODE("810")"\n"
+"\t"STUB_ASM_CODE("812")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTrackMatrixivNV))"\n"
-"\t"STUB_ASM_CODE("811")"\n"
+"\t"STUB_ASM_CODE("813")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
-"\t"STUB_ASM_CODE("812")"\n"
+"\t"STUB_ASM_CODE("814")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribPointerv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointerv)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
@@ -13393,568 +13415,568 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointervARB)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribdvNV))"\n"
-"\t"STUB_ASM_CODE("813")"\n"
+"\t"STUB_ASM_CODE("815")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribfvNV))"\n"
-"\t"STUB_ASM_CODE("814")"\n"
+"\t"STUB_ASM_CODE("816")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribivNV))"\n"
-"\t"STUB_ASM_CODE("815")"\n"
+"\t"STUB_ASM_CODE("817")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsProgramNV))"\n"
-"\t"STUB_ASM_CODE("816")"\n"
+"\t"STUB_ASM_CODE("818")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsProgramARB)"\n"
 ".set "GLAPI_PREFIX_STR(IsProgramARB)", "GLAPI_PREFIX_STR(IsProgramNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LoadProgramNV))"\n"
-"\t"STUB_ASM_CODE("817")"\n"
+"\t"STUB_ASM_CODE("819")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4dvNV))"\n"
-"\t"STUB_ASM_CODE("818")"\n"
+"\t"STUB_ASM_CODE("820")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4fvNV))"\n"
-"\t"STUB_ASM_CODE("819")"\n"
+"\t"STUB_ASM_CODE("821")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RequestResidentProgramsNV))"\n"
-"\t"STUB_ASM_CODE("820")"\n"
+"\t"STUB_ASM_CODE("822")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TrackMatrixNV))"\n"
-"\t"STUB_ASM_CODE("821")"\n"
+"\t"STUB_ASM_CODE("823")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dNV))"\n"
-"\t"STUB_ASM_CODE("822")"\n"
+"\t"STUB_ASM_CODE("824")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dvNV))"\n"
-"\t"STUB_ASM_CODE("823")"\n"
+"\t"STUB_ASM_CODE("825")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fNV))"\n"
-"\t"STUB_ASM_CODE("824")"\n"
+"\t"STUB_ASM_CODE("826")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fvNV))"\n"
-"\t"STUB_ASM_CODE("825")"\n"
+"\t"STUB_ASM_CODE("827")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1sNV))"\n"
-"\t"STUB_ASM_CODE("826")"\n"
+"\t"STUB_ASM_CODE("828")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1svNV))"\n"
-"\t"STUB_ASM_CODE("827")"\n"
+"\t"STUB_ASM_CODE("829")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dNV))"\n"
-"\t"STUB_ASM_CODE("828")"\n"
+"\t"STUB_ASM_CODE("830")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dvNV))"\n"
-"\t"STUB_ASM_CODE("829")"\n"
+"\t"STUB_ASM_CODE("831")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fNV))"\n"
-"\t"STUB_ASM_CODE("830")"\n"
+"\t"STUB_ASM_CODE("832")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fvNV))"\n"
-"\t"STUB_ASM_CODE("831")"\n"
+"\t"STUB_ASM_CODE("833")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2sNV))"\n"
-"\t"STUB_ASM_CODE("832")"\n"
+"\t"STUB_ASM_CODE("834")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2svNV))"\n"
-"\t"STUB_ASM_CODE("833")"\n"
+"\t"STUB_ASM_CODE("835")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dNV))"\n"
-"\t"STUB_ASM_CODE("834")"\n"
+"\t"STUB_ASM_CODE("836")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dvNV))"\n"
-"\t"STUB_ASM_CODE("835")"\n"
+"\t"STUB_ASM_CODE("837")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fNV))"\n"
-"\t"STUB_ASM_CODE("836")"\n"
+"\t"STUB_ASM_CODE("838")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fvNV))"\n"
-"\t"STUB_ASM_CODE("837")"\n"
+"\t"STUB_ASM_CODE("839")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3sNV))"\n"
-"\t"STUB_ASM_CODE("838")"\n"
+"\t"STUB_ASM_CODE("840")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3svNV))"\n"
-"\t"STUB_ASM_CODE("839")"\n"
+"\t"STUB_ASM_CODE("841")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dNV))"\n"
-"\t"STUB_ASM_CODE("840")"\n"
+"\t"STUB_ASM_CODE("842")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dvNV))"\n"
-"\t"STUB_ASM_CODE("841")"\n"
+"\t"STUB_ASM_CODE("843")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fNV))"\n"
-"\t"STUB_ASM_CODE("842")"\n"
+"\t"STUB_ASM_CODE("844")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fvNV))"\n"
-"\t"STUB_ASM_CODE("843")"\n"
+"\t"STUB_ASM_CODE("845")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4sNV))"\n"
-"\t"STUB_ASM_CODE("844")"\n"
+"\t"STUB_ASM_CODE("846")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4svNV))"\n"
-"\t"STUB_ASM_CODE("845")"\n"
+"\t"STUB_ASM_CODE("847")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubNV))"\n"
-"\t"STUB_ASM_CODE("846")"\n"
+"\t"STUB_ASM_CODE("848")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubvNV))"\n"
-"\t"STUB_ASM_CODE("847")"\n"
+"\t"STUB_ASM_CODE("849")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribPointerNV))"\n"
-"\t"STUB_ASM_CODE("848")"\n"
+"\t"STUB_ASM_CODE("850")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1dvNV))"\n"
-"\t"STUB_ASM_CODE("849")"\n"
+"\t"STUB_ASM_CODE("851")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1fvNV))"\n"
-"\t"STUB_ASM_CODE("850")"\n"
+"\t"STUB_ASM_CODE("852")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1svNV))"\n"
-"\t"STUB_ASM_CODE("851")"\n"
+"\t"STUB_ASM_CODE("853")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2dvNV))"\n"
-"\t"STUB_ASM_CODE("852")"\n"
+"\t"STUB_ASM_CODE("854")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2fvNV))"\n"
-"\t"STUB_ASM_CODE("853")"\n"
+"\t"STUB_ASM_CODE("855")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2svNV))"\n"
-"\t"STUB_ASM_CODE("854")"\n"
+"\t"STUB_ASM_CODE("856")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3dvNV))"\n"
-"\t"STUB_ASM_CODE("855")"\n"
+"\t"STUB_ASM_CODE("857")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3fvNV))"\n"
-"\t"STUB_ASM_CODE("856")"\n"
+"\t"STUB_ASM_CODE("858")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3svNV))"\n"
-"\t"STUB_ASM_CODE("857")"\n"
+"\t"STUB_ASM_CODE("859")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4dvNV))"\n"
-"\t"STUB_ASM_CODE("858")"\n"
+"\t"STUB_ASM_CODE("860")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4fvNV))"\n"
-"\t"STUB_ASM_CODE("859")"\n"
+"\t"STUB_ASM_CODE("861")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4svNV))"\n"
-"\t"STUB_ASM_CODE("860")"\n"
+"\t"STUB_ASM_CODE("862")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4ubvNV))"\n"
-"\t"STUB_ASM_CODE("861")"\n"
+"\t"STUB_ASM_CODE("863")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("862")"\n"
+"\t"STUB_ASM_CODE("864")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("863")"\n"
+"\t"STUB_ASM_CODE("865")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("864")"\n"
+"\t"STUB_ASM_CODE("866")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("865")"\n"
+"\t"STUB_ASM_CODE("867")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("866")"\n"
+"\t"STUB_ASM_CODE("868")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("867")"\n"
+"\t"STUB_ASM_CODE("869")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("868")"\n"
+"\t"STUB_ASM_CODE("870")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("869")"\n"
+"\t"STUB_ASM_CODE("871")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("870")"\n"
+"\t"STUB_ASM_CODE("872")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("871")"\n"
+"\t"STUB_ASM_CODE("873")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("872")"\n"
+"\t"STUB_ASM_CODE("874")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("873")"\n"
+"\t"STUB_ASM_CODE("875")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("874")"\n"
+"\t"STUB_ASM_CODE("876")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("875")"\n"
+"\t"STUB_ASM_CODE("877")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFragmentShadersATI))"\n"
-"\t"STUB_ASM_CODE("876")"\n"
+"\t"STUB_ASM_CODE("878")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PassTexCoordATI))"\n"
-"\t"STUB_ASM_CODE("877")"\n"
+"\t"STUB_ASM_CODE("879")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SampleMapATI))"\n"
-"\t"STUB_ASM_CODE("878")"\n"
+"\t"STUB_ASM_CODE("880")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SetFragmentShaderConstantATI))"\n"
-"\t"STUB_ASM_CODE("879")"\n"
+"\t"STUB_ASM_CODE("881")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameteriNV))"\n"
-"\t"STUB_ASM_CODE("880")"\n"
+"\t"STUB_ASM_CODE("882")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameteri)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameteri)", "GLAPI_PREFIX_STR(PointParameteriNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterivNV))"\n"
-"\t"STUB_ASM_CODE("881")"\n"
+"\t"STUB_ASM_CODE("883")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameteriv)", "GLAPI_PREFIX_STR(PointParameterivNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteVertexArrays))"\n"
-"\t"STUB_ASM_CODE("884")"\n"
+"\t"STUB_ASM_CODE("886")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsVertexArray))"\n"
-"\t"STUB_ASM_CODE("886")"\n"
+"\t"STUB_ASM_CODE("888")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("887")"\n"
+"\t"STUB_ASM_CODE("889")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("888")"\n"
+"\t"STUB_ASM_CODE("890")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dNV))"\n"
-"\t"STUB_ASM_CODE("889")"\n"
+"\t"STUB_ASM_CODE("891")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dvNV))"\n"
-"\t"STUB_ASM_CODE("890")"\n"
+"\t"STUB_ASM_CODE("892")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fNV))"\n"
-"\t"STUB_ASM_CODE("891")"\n"
+"\t"STUB_ASM_CODE("893")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fvNV))"\n"
-"\t"STUB_ASM_CODE("892")"\n"
+"\t"STUB_ASM_CODE("894")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartIndexNV))"\n"
-"\t"STUB_ASM_CODE("893")"\n"
+"\t"STUB_ASM_CODE("895")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PrimitiveRestartIndex)"\n"
 ".set "GLAPI_PREFIX_STR(PrimitiveRestartIndex)", "GLAPI_PREFIX_STR(PrimitiveRestartIndexNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartNV))"\n"
-"\t"STUB_ASM_CODE("894")"\n"
+"\t"STUB_ASM_CODE("896")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendEquationSeparate))"\n"
-"\t"STUB_ASM_CODE("942")"\n"
+"\t"STUB_ASM_CODE("944")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("943")"\n"
+"\t"STUB_ASM_CODE("945")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindFramebuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindFramebuffer)", "GLAPI_PREFIX_STR(BindFramebufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("944")"\n"
+"\t"STUB_ASM_CODE("946")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindRenderbuffer)", "GLAPI_PREFIX_STR(BindRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CheckFramebufferStatusEXT))"\n"
-"\t"STUB_ASM_CODE("945")"\n"
+"\t"STUB_ASM_CODE("947")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CheckFramebufferStatus)"\n"
 ".set "GLAPI_PREFIX_STR(CheckFramebufferStatus)", "GLAPI_PREFIX_STR(CheckFramebufferStatusEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFramebuffersEXT))"\n"
-"\t"STUB_ASM_CODE("946")"\n"
+"\t"STUB_ASM_CODE("948")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteFramebuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteFramebuffers)", "GLAPI_PREFIX_STR(DeleteFramebuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteRenderbuffersEXT))"\n"
-"\t"STUB_ASM_CODE("947")"\n"
+"\t"STUB_ASM_CODE("949")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteRenderbuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteRenderbuffers)", "GLAPI_PREFIX_STR(DeleteRenderbuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("948")"\n"
+"\t"STUB_ASM_CODE("950")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferRenderbuffer)", "GLAPI_PREFIX_STR(FramebufferRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture1DEXT))"\n"
-"\t"STUB_ASM_CODE("949")"\n"
+"\t"STUB_ASM_CODE("951")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture1D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture1D)", "GLAPI_PREFIX_STR(FramebufferTexture1DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture2DEXT))"\n"
-"\t"STUB_ASM_CODE("950")"\n"
+"\t"STUB_ASM_CODE("952")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture2D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture2D)", "GLAPI_PREFIX_STR(FramebufferTexture2DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture3DEXT))"\n"
-"\t"STUB_ASM_CODE("951")"\n"
+"\t"STUB_ASM_CODE("953")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture3D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture3D)", "GLAPI_PREFIX_STR(FramebufferTexture3DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFramebuffersEXT))"\n"
-"\t"STUB_ASM_CODE("952")"\n"
+"\t"STUB_ASM_CODE("954")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenFramebuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenFramebuffers)", "GLAPI_PREFIX_STR(GenFramebuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenRenderbuffersEXT))"\n"
-"\t"STUB_ASM_CODE("953")"\n"
+"\t"STUB_ASM_CODE("955")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenRenderbuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenRenderbuffers)", "GLAPI_PREFIX_STR(GenRenderbuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenerateMipmapEXT))"\n"
-"\t"STUB_ASM_CODE("954")"\n"
+"\t"STUB_ASM_CODE("956")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenerateMipmap)"\n"
 ".set "GLAPI_PREFIX_STR(GenerateMipmap)", "GLAPI_PREFIX_STR(GenerateMipmapEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFramebufferAttachmentParameterivEXT))"\n"
-"\t"STUB_ASM_CODE("955")"\n"
+"\t"STUB_ASM_CODE("957")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameteriv)", "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameterivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetRenderbufferParameterivEXT))"\n"
-"\t"STUB_ASM_CODE("956")"\n"
+"\t"STUB_ASM_CODE("958")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetRenderbufferParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetRenderbufferParameteriv)", "GLAPI_PREFIX_STR(GetRenderbufferParameterivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("957")"\n"
+"\t"STUB_ASM_CODE("959")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsFramebuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsFramebuffer)", "GLAPI_PREFIX_STR(IsFramebufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("958")"\n"
+"\t"STUB_ASM_CODE("960")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsRenderbuffer)", "GLAPI_PREFIX_STR(IsRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RenderbufferStorageEXT))"\n"
-"\t"STUB_ASM_CODE("959")"\n"
+"\t"STUB_ASM_CODE("961")"\n"
 
 ".globl "GLAPI_PREFIX_STR(RenderbufferStorage)"\n"
 ".set "GLAPI_PREFIX_STR(RenderbufferStorage)", "GLAPI_PREFIX_STR(RenderbufferStorageEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlitFramebuffer))"\n"
-"\t"STUB_ASM_CODE("960")"\n"
+"\t"STUB_ASM_CODE("962")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("963")"\n"
+"\t"STUB_ASM_CODE("965")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindFragDataLocation)"\n"
 ".set "GLAPI_PREFIX_STR(BindFragDataLocation)", "GLAPI_PREFIX_STR(BindFragDataLocationEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("964")"\n"
+"\t"STUB_ASM_CODE("966")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetFragDataLocation)"\n"
 ".set "GLAPI_PREFIX_STR(GetFragDataLocation)", "GLAPI_PREFIX_STR(GetFragDataLocationEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetUniformuivEXT))"\n"
-"\t"STUB_ASM_CODE("965")"\n"
+"\t"STUB_ASM_CODE("967")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetUniformuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetUniformuiv)", "GLAPI_PREFIX_STR(GetUniformuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribIivEXT))"\n"
-"\t"STUB_ASM_CODE("966")"\n"
+"\t"STUB_ASM_CODE("968")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribIiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribIiv)", "GLAPI_PREFIX_STR(GetVertexAttribIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribIuivEXT))"\n"
-"\t"STUB_ASM_CODE("967")"\n"
+"\t"STUB_ASM_CODE("969")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribIuiv)", "GLAPI_PREFIX_STR(GetVertexAttribIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1uiEXT))"\n"
-"\t"STUB_ASM_CODE("968")"\n"
+"\t"STUB_ASM_CODE("970")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1ui)", "GLAPI_PREFIX_STR(Uniform1uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1uivEXT))"\n"
-"\t"STUB_ASM_CODE("969")"\n"
+"\t"STUB_ASM_CODE("971")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1uiv)", "GLAPI_PREFIX_STR(Uniform1uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2uiEXT))"\n"
-"\t"STUB_ASM_CODE("970")"\n"
+"\t"STUB_ASM_CODE("972")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2ui)", "GLAPI_PREFIX_STR(Uniform2uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2uivEXT))"\n"
-"\t"STUB_ASM_CODE("971")"\n"
+"\t"STUB_ASM_CODE("973")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2uiv)", "GLAPI_PREFIX_STR(Uniform2uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3uiEXT))"\n"
-"\t"STUB_ASM_CODE("972")"\n"
+"\t"STUB_ASM_CODE("974")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3ui)", "GLAPI_PREFIX_STR(Uniform3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3uivEXT))"\n"
-"\t"STUB_ASM_CODE("973")"\n"
+"\t"STUB_ASM_CODE("975")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3uiv)", "GLAPI_PREFIX_STR(Uniform3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4uiEXT))"\n"
-"\t"STUB_ASM_CODE("974")"\n"
+"\t"STUB_ASM_CODE("976")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4ui)", "GLAPI_PREFIX_STR(Uniform4uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4uivEXT))"\n"
-"\t"STUB_ASM_CODE("975")"\n"
+"\t"STUB_ASM_CODE("977")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4uiv)", "GLAPI_PREFIX_STR(Uniform4uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1iEXT))"\n"
-"\t"STUB_ASM_CODE("976")"\n"
+"\t"STUB_ASM_CODE("978")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1i)", "GLAPI_PREFIX_STR(VertexAttribI1iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1ivEXT))"\n"
-"\t"STUB_ASM_CODE("977")"\n"
+"\t"STUB_ASM_CODE("979")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1iv)", "GLAPI_PREFIX_STR(VertexAttribI1ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1uiEXT))"\n"
-"\t"STUB_ASM_CODE("978")"\n"
+"\t"STUB_ASM_CODE("980")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1ui)", "GLAPI_PREFIX_STR(VertexAttribI1uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1uivEXT))"\n"
-"\t"STUB_ASM_CODE("979")"\n"
+"\t"STUB_ASM_CODE("981")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1uiv)", "GLAPI_PREFIX_STR(VertexAttribI1uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2iEXT))"\n"
-"\t"STUB_ASM_CODE("980")"\n"
+"\t"STUB_ASM_CODE("982")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2i)", "GLAPI_PREFIX_STR(VertexAttribI2iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2ivEXT))"\n"
-"\t"STUB_ASM_CODE("981")"\n"
+"\t"STUB_ASM_CODE("983")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2iv)", "GLAPI_PREFIX_STR(VertexAttribI2ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2uiEXT))"\n"
-"\t"STUB_ASM_CODE("982")"\n"
+"\t"STUB_ASM_CODE("984")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2ui)", "GLAPI_PREFIX_STR(VertexAttribI2uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2uivEXT))"\n"
-"\t"STUB_ASM_CODE("983")"\n"
+"\t"STUB_ASM_CODE("985")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2uiv)", "GLAPI_PREFIX_STR(VertexAttribI2uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3iEXT))"\n"
-"\t"STUB_ASM_CODE("984")"\n"
+"\t"STUB_ASM_CODE("986")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3i)", "GLAPI_PREFIX_STR(VertexAttribI3iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3ivEXT))"\n"
-"\t"STUB_ASM_CODE("985")"\n"
+"\t"STUB_ASM_CODE("987")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3iv)", "GLAPI_PREFIX_STR(VertexAttribI3ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3uiEXT))"\n"
-"\t"STUB_ASM_CODE("986")"\n"
+"\t"STUB_ASM_CODE("988")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3ui)", "GLAPI_PREFIX_STR(VertexAttribI3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3uivEXT))"\n"
-"\t"STUB_ASM_CODE("987")"\n"
+"\t"STUB_ASM_CODE("989")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3uiv)", "GLAPI_PREFIX_STR(VertexAttribI3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4bvEXT))"\n"
-"\t"STUB_ASM_CODE("988")"\n"
+"\t"STUB_ASM_CODE("990")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4bv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4bv)", "GLAPI_PREFIX_STR(VertexAttribI4bvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4iEXT))"\n"
-"\t"STUB_ASM_CODE("989")"\n"
+"\t"STUB_ASM_CODE("991")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4i)", "GLAPI_PREFIX_STR(VertexAttribI4iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4ivEXT))"\n"
-"\t"STUB_ASM_CODE("990")"\n"
+"\t"STUB_ASM_CODE("992")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4iv)", "GLAPI_PREFIX_STR(VertexAttribI4ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4svEXT))"\n"
-"\t"STUB_ASM_CODE("991")"\n"
+"\t"STUB_ASM_CODE("993")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4sv)", "GLAPI_PREFIX_STR(VertexAttribI4svEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4ubvEXT))"\n"
-"\t"STUB_ASM_CODE("992")"\n"
+"\t"STUB_ASM_CODE("994")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4ubv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4ubv)", "GLAPI_PREFIX_STR(VertexAttribI4ubvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4uiEXT))"\n"
-"\t"STUB_ASM_CODE("993")"\n"
+"\t"STUB_ASM_CODE("995")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4ui)", "GLAPI_PREFIX_STR(VertexAttribI4uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4uivEXT))"\n"
-"\t"STUB_ASM_CODE("994")"\n"
+"\t"STUB_ASM_CODE("996")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4uiv)", "GLAPI_PREFIX_STR(VertexAttribI4uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4usvEXT))"\n"
-"\t"STUB_ASM_CODE("995")"\n"
+"\t"STUB_ASM_CODE("997")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4usv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4usv)", "GLAPI_PREFIX_STR(VertexAttribI4usvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribIPointerEXT))"\n"
-"\t"STUB_ASM_CODE("996")"\n"
+"\t"STUB_ASM_CODE("998")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribIPointer)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribIPointer)", "GLAPI_PREFIX_STR(VertexAttribIPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureLayerEXT))"\n"
-"\t"STUB_ASM_CODE("997")"\n"
+"\t"STUB_ASM_CODE("999")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTextureLayer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTextureLayer)", "GLAPI_PREFIX_STR(FramebufferTextureLayerEXT)"\n"
@@ -13963,154 +13985,154 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureLayerEXT))"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTextureLayerARB)", "GLAPI_PREFIX_STR(FramebufferTextureLayerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorMaskIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("998")"\n"
+"\t"STUB_ASM_CODE("1000")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ColorMaski)"\n"
 ".set "GLAPI_PREFIX_STR(ColorMaski)", "GLAPI_PREFIX_STR(ColorMaskIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DisableIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("999")"\n"
+"\t"STUB_ASM_CODE("1001")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Disablei)"\n"
 ".set "GLAPI_PREFIX_STR(Disablei)", "GLAPI_PREFIX_STR(DisableIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EnableIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("1000")"\n"
+"\t"STUB_ASM_CODE("1002")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Enablei)"\n"
 ".set "GLAPI_PREFIX_STR(Enablei)", "GLAPI_PREFIX_STR(EnableIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBooleanIndexedvEXT))"\n"
-"\t"STUB_ASM_CODE("1001")"\n"
+"\t"STUB_ASM_CODE("1003")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetBooleani_v)"\n"
 ".set "GLAPI_PREFIX_STR(GetBooleani_v)", "GLAPI_PREFIX_STR(GetBooleanIndexedvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetIntegerIndexedvEXT))"\n"
-"\t"STUB_ASM_CODE("1002")"\n"
+"\t"STUB_ASM_CODE("1004")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetIntegeri_v)"\n"
 ".set "GLAPI_PREFIX_STR(GetIntegeri_v)", "GLAPI_PREFIX_STR(GetIntegerIndexedvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsEnabledIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("1003")"\n"
+"\t"STUB_ASM_CODE("1005")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsEnabledi)"\n"
 ".set "GLAPI_PREFIX_STR(IsEnabledi)", "GLAPI_PREFIX_STR(IsEnabledIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIiEXT))"\n"
-"\t"STUB_ASM_CODE("1004")"\n"
+"\t"STUB_ASM_CODE("1006")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIuiEXT))"\n"
-"\t"STUB_ASM_CODE("1005")"\n"
+"\t"STUB_ASM_CODE("1007")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("1006")"\n"
+"\t"STUB_ASM_CODE("1008")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTexParameterIiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetTexParameterIiv)", "GLAPI_PREFIX_STR(GetTexParameterIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIuivEXT))"\n"
-"\t"STUB_ASM_CODE("1007")"\n"
+"\t"STUB_ASM_CODE("1009")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTexParameterIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetTexParameterIuiv)", "GLAPI_PREFIX_STR(GetTexParameterIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("1008")"\n"
+"\t"STUB_ASM_CODE("1010")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TexParameterIiv)"\n"
 ".set "GLAPI_PREFIX_STR(TexParameterIiv)", "GLAPI_PREFIX_STR(TexParameterIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexParameterIuivEXT))"\n"
-"\t"STUB_ASM_CODE("1009")"\n"
+"\t"STUB_ASM_CODE("1011")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TexParameterIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(TexParameterIuiv)", "GLAPI_PREFIX_STR(TexParameterIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginConditionalRenderNV))"\n"
-"\t"STUB_ASM_CODE("1010")"\n"
+"\t"STUB_ASM_CODE("1012")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginConditionalRender)"\n"
 ".set "GLAPI_PREFIX_STR(BeginConditionalRender)", "GLAPI_PREFIX_STR(BeginConditionalRenderNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndConditionalRenderNV))"\n"
-"\t"STUB_ASM_CODE("1011")"\n"
+"\t"STUB_ASM_CODE("1013")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndConditionalRender)"\n"
 ".set "GLAPI_PREFIX_STR(EndConditionalRender)", "GLAPI_PREFIX_STR(EndConditionalRenderNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginTransformFeedbackEXT))"\n"
-"\t"STUB_ASM_CODE("1012")"\n"
+"\t"STUB_ASM_CODE("1014")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginTransformFeedback)"\n"
 ".set "GLAPI_PREFIX_STR(BeginTransformFeedback)", "GLAPI_PREFIX_STR(BeginTransformFeedbackEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferBaseEXT))"\n"
-"\t"STUB_ASM_CODE("1013")"\n"
+"\t"STUB_ASM_CODE("1015")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBufferBase)"\n"
 ".set "GLAPI_PREFIX_STR(BindBufferBase)", "GLAPI_PREFIX_STR(BindBufferBaseEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferOffsetEXT))"\n"
-"\t"STUB_ASM_CODE("1014")"\n"
+"\t"STUB_ASM_CODE("1016")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferRangeEXT))"\n"
-"\t"STUB_ASM_CODE("1015")"\n"
+"\t"STUB_ASM_CODE("1017")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBufferRange)"\n"
 ".set "GLAPI_PREFIX_STR(BindBufferRange)", "GLAPI_PREFIX_STR(BindBufferRangeEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndTransformFeedbackEXT))"\n"
-"\t"STUB_ASM_CODE("1016")"\n"
+"\t"STUB_ASM_CODE("1018")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndTransformFeedback)"\n"
 ".set "GLAPI_PREFIX_STR(EndTransformFeedback)", "GLAPI_PREFIX_STR(EndTransformFeedbackEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTransformFeedbackVaryingEXT))"\n"
-"\t"STUB_ASM_CODE("1017")"\n"
+"\t"STUB_ASM_CODE("1019")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTransformFeedbackVarying)"\n"
 ".set "GLAPI_PREFIX_STR(GetTransformFeedbackVarying)", "GLAPI_PREFIX_STR(GetTransformFeedbackVaryingEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TransformFeedbackVaryingsEXT))"\n"
-"\t"STUB_ASM_CODE("1018")"\n"
+"\t"STUB_ASM_CODE("1020")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TransformFeedbackVaryings)"\n"
 ".set "GLAPI_PREFIX_STR(TransformFeedbackVaryings)", "GLAPI_PREFIX_STR(TransformFeedbackVaryingsEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProvokingVertexEXT))"\n"
-"\t"STUB_ASM_CODE("1019")"\n"
+"\t"STUB_ASM_CODE("1021")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProvokingVertex)"\n"
 ".set "GLAPI_PREFIX_STR(ProvokingVertex)", "GLAPI_PREFIX_STR(ProvokingVertexEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetObjectParameterivAPPLE))"\n"
-"\t"STUB_ASM_CODE("1022")"\n"
+"\t"STUB_ASM_CODE("1024")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectPurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("1023")"\n"
+"\t"STUB_ASM_CODE("1025")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectUnpurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("1024")"\n"
+"\t"STUB_ASM_CODE("1026")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ActiveProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1025")"\n"
+"\t"STUB_ASM_CODE("1027")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CreateShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1026")"\n"
+"\t"STUB_ASM_CODE("1028")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UseShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1027")"\n"
+"\t"STUB_ASM_CODE("1029")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureBarrierNV))"\n"
-"\t"STUB_ASM_CODE("1028")"\n"
+"\t"STUB_ASM_CODE("1030")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetRenderbufferStorageOES))"\n"
-"\t"STUB_ASM_CODE("1034")"\n"
+"\t"STUB_ASM_CODE("1036")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetTexture2DOES))"\n"
-"\t"STUB_ASM_CODE("1035")"\n"
+"\t"STUB_ASM_CODE("1037")"\n"
 
 );
 #undef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN
diff --git a/mesalib/src/mapi/glapi/glapi_sparc.S b/mesalib/src/mapi/glapi/glapi_sparc.S
index fd5f90fd6..48b792fce 100644
--- a/mesalib/src/mapi/glapi/glapi_sparc.S
+++ b/mesalib/src/mapi/glapi/glapi_sparc.S
@@ -796,105 +796,103 @@ gl_dispatch_functions_start:
 	GL_STUB(glBlendEquationiARB, 598)
 	GL_STUB(glBlendFuncSeparateiARB, 599)
 	GL_STUB(glBlendFunciARB, 600)
-	GL_STUB(glBindSampler, 601)
-	GL_STUB(glDeleteSamplers, 602)
-	GL_STUB(glGenSamplers, 603)
-	GL_STUB(glGetSamplerParameterIiv, 604)
-	GL_STUB(glGetSamplerParameterIuiv, 605)
-	GL_STUB(glGetSamplerParameterfv, 606)
-	GL_STUB(glGetSamplerParameteriv, 607)
-	GL_STUB(glIsSampler, 608)
-	GL_STUB(glSamplerParameterIiv, 609)
-	GL_STUB(glSamplerParameterIuiv, 610)
-	GL_STUB(glSamplerParameterf, 611)
-	GL_STUB(glSamplerParameterfv, 612)
-	GL_STUB(glSamplerParameteri, 613)
-	GL_STUB(glSamplerParameteriv, 614)
-	GL_STUB(glColorP3ui, 615)
-	GL_STUB(glColorP3uiv, 616)
-	GL_STUB(glColorP4ui, 617)
-	GL_STUB(glColorP4uiv, 618)
-	GL_STUB(glMultiTexCoordP1ui, 619)
-	GL_STUB(glMultiTexCoordP1uiv, 620)
-	GL_STUB(glMultiTexCoordP2ui, 621)
-	GL_STUB(glMultiTexCoordP2uiv, 622)
-	GL_STUB(glMultiTexCoordP3ui, 623)
-	GL_STUB(glMultiTexCoordP3uiv, 624)
-	GL_STUB(glMultiTexCoordP4ui, 625)
-	GL_STUB(glMultiTexCoordP4uiv, 626)
-	GL_STUB(glNormalP3ui, 627)
-	GL_STUB(glNormalP3uiv, 628)
-	GL_STUB(glSecondaryColorP3ui, 629)
-	GL_STUB(glSecondaryColorP3uiv, 630)
-	GL_STUB(glTexCoordP1ui, 631)
-	GL_STUB(glTexCoordP1uiv, 632)
-	GL_STUB(glTexCoordP2ui, 633)
-	GL_STUB(glTexCoordP2uiv, 634)
-	GL_STUB(glTexCoordP3ui, 635)
-	GL_STUB(glTexCoordP3uiv, 636)
-	GL_STUB(glTexCoordP4ui, 637)
-	GL_STUB(glTexCoordP4uiv, 638)
-	GL_STUB(glVertexAttribP1ui, 639)
-	GL_STUB(glVertexAttribP1uiv, 640)
-	GL_STUB(glVertexAttribP2ui, 641)
-	GL_STUB(glVertexAttribP2uiv, 642)
-	GL_STUB(glVertexAttribP3ui, 643)
-	GL_STUB(glVertexAttribP3uiv, 644)
-	GL_STUB(glVertexAttribP4ui, 645)
-	GL_STUB(glVertexAttribP4uiv, 646)
-	GL_STUB(glVertexP2ui, 647)
-	GL_STUB(glVertexP2uiv, 648)
-	GL_STUB(glVertexP3ui, 649)
-	GL_STUB(glVertexP3uiv, 650)
-	GL_STUB(glVertexP4ui, 651)
-	GL_STUB(glVertexP4uiv, 652)
-	GL_STUB(glBindTransformFeedback, 653)
-	GL_STUB(glDeleteTransformFeedbacks, 654)
-	GL_STUB(glDrawTransformFeedback, 655)
-	GL_STUB(glGenTransformFeedbacks, 656)
-	GL_STUB(glIsTransformFeedback, 657)
-	GL_STUB(glPauseTransformFeedback, 658)
-	GL_STUB(glResumeTransformFeedback, 659)
-	GL_STUB(glClearDepthf, 660)
-	GL_STUB(glDepthRangef, 661)
-	GL_STUB(glGetShaderPrecisionFormat, 662)
-	GL_STUB(glReleaseShaderCompiler, 663)
-	GL_STUB(glShaderBinary, 664)
-	GL_STUB(glDebugMessageCallbackARB, 665)
-	GL_STUB(glDebugMessageControlARB, 666)
-	GL_STUB(glDebugMessageInsertARB, 667)
-	GL_STUB(glGetDebugMessageLogARB, 668)
-	GL_STUB(glGetGraphicsResetStatusARB, 669)
-	GL_STUB(glGetnColorTableARB, 670)
-	GL_STUB(glGetnCompressedTexImageARB, 671)
-	GL_STUB(glGetnConvolutionFilterARB, 672)
-	GL_STUB(glGetnHistogramARB, 673)
-	GL_STUB(glGetnMapdvARB, 674)
-	GL_STUB(glGetnMapfvARB, 675)
-	GL_STUB(glGetnMapivARB, 676)
-	GL_STUB(glGetnMinmaxARB, 677)
-	GL_STUB(glGetnPixelMapfvARB, 678)
-	GL_STUB(glGetnPixelMapuivARB, 679)
-	GL_STUB(glGetnPixelMapusvARB, 680)
-	GL_STUB(glGetnPolygonStippleARB, 681)
-	GL_STUB(glGetnSeparableFilterARB, 682)
-	GL_STUB(glGetnTexImageARB, 683)
-	GL_STUB(glGetnUniformdvARB, 684)
-	GL_STUB(glGetnUniformfvARB, 685)
-	GL_STUB(glGetnUniformivARB, 686)
-	GL_STUB(glGetnUniformuivARB, 687)
-	GL_STUB(glReadnPixelsARB, 688)
-	GL_STUB(glTexStorage1D, 689)
-	GL_STUB(glTexStorage2D, 690)
-	GL_STUB(glTexStorage3D, 691)
-	GL_STUB(glTextureStorage1DEXT, 692)
-	GL_STUB(glTextureStorage2DEXT, 693)
-	GL_STUB(glTextureStorage3DEXT, 694)
-	GL_STUB(glPolygonOffsetEXT, 695)
-	GL_STUB(gl_dispatch_stub_696, 696)
-	HIDDEN(gl_dispatch_stub_696)
-	GL_STUB(gl_dispatch_stub_697, 697)
-	HIDDEN(gl_dispatch_stub_697)
+	GL_STUB(glBindFragDataLocationIndexed, 601)
+	GL_STUB(glGetFragDataIndex, 602)
+	GL_STUB(glBindSampler, 603)
+	GL_STUB(glDeleteSamplers, 604)
+	GL_STUB(glGenSamplers, 605)
+	GL_STUB(glGetSamplerParameterIiv, 606)
+	GL_STUB(glGetSamplerParameterIuiv, 607)
+	GL_STUB(glGetSamplerParameterfv, 608)
+	GL_STUB(glGetSamplerParameteriv, 609)
+	GL_STUB(glIsSampler, 610)
+	GL_STUB(glSamplerParameterIiv, 611)
+	GL_STUB(glSamplerParameterIuiv, 612)
+	GL_STUB(glSamplerParameterf, 613)
+	GL_STUB(glSamplerParameterfv, 614)
+	GL_STUB(glSamplerParameteri, 615)
+	GL_STUB(glSamplerParameteriv, 616)
+	GL_STUB(glColorP3ui, 617)
+	GL_STUB(glColorP3uiv, 618)
+	GL_STUB(glColorP4ui, 619)
+	GL_STUB(glColorP4uiv, 620)
+	GL_STUB(glMultiTexCoordP1ui, 621)
+	GL_STUB(glMultiTexCoordP1uiv, 622)
+	GL_STUB(glMultiTexCoordP2ui, 623)
+	GL_STUB(glMultiTexCoordP2uiv, 624)
+	GL_STUB(glMultiTexCoordP3ui, 625)
+	GL_STUB(glMultiTexCoordP3uiv, 626)
+	GL_STUB(glMultiTexCoordP4ui, 627)
+	GL_STUB(glMultiTexCoordP4uiv, 628)
+	GL_STUB(glNormalP3ui, 629)
+	GL_STUB(glNormalP3uiv, 630)
+	GL_STUB(glSecondaryColorP3ui, 631)
+	GL_STUB(glSecondaryColorP3uiv, 632)
+	GL_STUB(glTexCoordP1ui, 633)
+	GL_STUB(glTexCoordP1uiv, 634)
+	GL_STUB(glTexCoordP2ui, 635)
+	GL_STUB(glTexCoordP2uiv, 636)
+	GL_STUB(glTexCoordP3ui, 637)
+	GL_STUB(glTexCoordP3uiv, 638)
+	GL_STUB(glTexCoordP4ui, 639)
+	GL_STUB(glTexCoordP4uiv, 640)
+	GL_STUB(glVertexAttribP1ui, 641)
+	GL_STUB(glVertexAttribP1uiv, 642)
+	GL_STUB(glVertexAttribP2ui, 643)
+	GL_STUB(glVertexAttribP2uiv, 644)
+	GL_STUB(glVertexAttribP3ui, 645)
+	GL_STUB(glVertexAttribP3uiv, 646)
+	GL_STUB(glVertexAttribP4ui, 647)
+	GL_STUB(glVertexAttribP4uiv, 648)
+	GL_STUB(glVertexP2ui, 649)
+	GL_STUB(glVertexP2uiv, 650)
+	GL_STUB(glVertexP3ui, 651)
+	GL_STUB(glVertexP3uiv, 652)
+	GL_STUB(glVertexP4ui, 653)
+	GL_STUB(glVertexP4uiv, 654)
+	GL_STUB(glBindTransformFeedback, 655)
+	GL_STUB(glDeleteTransformFeedbacks, 656)
+	GL_STUB(glDrawTransformFeedback, 657)
+	GL_STUB(glGenTransformFeedbacks, 658)
+	GL_STUB(glIsTransformFeedback, 659)
+	GL_STUB(glPauseTransformFeedback, 660)
+	GL_STUB(glResumeTransformFeedback, 661)
+	GL_STUB(glClearDepthf, 662)
+	GL_STUB(glDepthRangef, 663)
+	GL_STUB(glGetShaderPrecisionFormat, 664)
+	GL_STUB(glReleaseShaderCompiler, 665)
+	GL_STUB(glShaderBinary, 666)
+	GL_STUB(glDebugMessageCallbackARB, 667)
+	GL_STUB(glDebugMessageControlARB, 668)
+	GL_STUB(glDebugMessageInsertARB, 669)
+	GL_STUB(glGetDebugMessageLogARB, 670)
+	GL_STUB(glGetGraphicsResetStatusARB, 671)
+	GL_STUB(glGetnColorTableARB, 672)
+	GL_STUB(glGetnCompressedTexImageARB, 673)
+	GL_STUB(glGetnConvolutionFilterARB, 674)
+	GL_STUB(glGetnHistogramARB, 675)
+	GL_STUB(glGetnMapdvARB, 676)
+	GL_STUB(glGetnMapfvARB, 677)
+	GL_STUB(glGetnMapivARB, 678)
+	GL_STUB(glGetnMinmaxARB, 679)
+	GL_STUB(glGetnPixelMapfvARB, 680)
+	GL_STUB(glGetnPixelMapuivARB, 681)
+	GL_STUB(glGetnPixelMapusvARB, 682)
+	GL_STUB(glGetnPolygonStippleARB, 683)
+	GL_STUB(glGetnSeparableFilterARB, 684)
+	GL_STUB(glGetnTexImageARB, 685)
+	GL_STUB(glGetnUniformdvARB, 686)
+	GL_STUB(glGetnUniformfvARB, 687)
+	GL_STUB(glGetnUniformivARB, 688)
+	GL_STUB(glGetnUniformuivARB, 689)
+	GL_STUB(glReadnPixelsARB, 690)
+	GL_STUB(glTexStorage1D, 691)
+	GL_STUB(glTexStorage2D, 692)
+	GL_STUB(glTexStorage3D, 693)
+	GL_STUB(glTextureStorage1DEXT, 694)
+	GL_STUB(glTextureStorage2DEXT, 695)
+	GL_STUB(glTextureStorage3DEXT, 696)
+	GL_STUB(glPolygonOffsetEXT, 697)
 	GL_STUB(gl_dispatch_stub_698, 698)
 	HIDDEN(gl_dispatch_stub_698)
 	GL_STUB(gl_dispatch_stub_699, 699)
@@ -907,87 +905,87 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_702)
 	GL_STUB(gl_dispatch_stub_703, 703)
 	HIDDEN(gl_dispatch_stub_703)
-	GL_STUB(glColorPointerEXT, 704)
-	GL_STUB(glEdgeFlagPointerEXT, 705)
-	GL_STUB(glIndexPointerEXT, 706)
-	GL_STUB(glNormalPointerEXT, 707)
-	GL_STUB(glTexCoordPointerEXT, 708)
-	GL_STUB(glVertexPointerEXT, 709)
-	GL_STUB(glPointParameterfEXT, 710)
-	GL_STUB(glPointParameterfvEXT, 711)
-	GL_STUB(glLockArraysEXT, 712)
-	GL_STUB(glUnlockArraysEXT, 713)
-	GL_STUB(glSecondaryColor3bEXT, 714)
-	GL_STUB(glSecondaryColor3bvEXT, 715)
-	GL_STUB(glSecondaryColor3dEXT, 716)
-	GL_STUB(glSecondaryColor3dvEXT, 717)
-	GL_STUB(glSecondaryColor3fEXT, 718)
-	GL_STUB(glSecondaryColor3fvEXT, 719)
-	GL_STUB(glSecondaryColor3iEXT, 720)
-	GL_STUB(glSecondaryColor3ivEXT, 721)
-	GL_STUB(glSecondaryColor3sEXT, 722)
-	GL_STUB(glSecondaryColor3svEXT, 723)
-	GL_STUB(glSecondaryColor3ubEXT, 724)
-	GL_STUB(glSecondaryColor3ubvEXT, 725)
-	GL_STUB(glSecondaryColor3uiEXT, 726)
-	GL_STUB(glSecondaryColor3uivEXT, 727)
-	GL_STUB(glSecondaryColor3usEXT, 728)
-	GL_STUB(glSecondaryColor3usvEXT, 729)
-	GL_STUB(glSecondaryColorPointerEXT, 730)
-	GL_STUB(glMultiDrawArraysEXT, 731)
-	GL_STUB(glMultiDrawElementsEXT, 732)
-	GL_STUB(glFogCoordPointerEXT, 733)
-	GL_STUB(glFogCoorddEXT, 734)
-	GL_STUB(glFogCoorddvEXT, 735)
-	GL_STUB(glFogCoordfEXT, 736)
-	GL_STUB(glFogCoordfvEXT, 737)
-	GL_STUB(gl_dispatch_stub_738, 738)
-	HIDDEN(gl_dispatch_stub_738)
-	GL_STUB(glBlendFuncSeparateEXT, 739)
-	GL_STUB(glFlushVertexArrayRangeNV, 740)
-	GL_STUB(glVertexArrayRangeNV, 741)
-	GL_STUB(glCombinerInputNV, 742)
-	GL_STUB(glCombinerOutputNV, 743)
-	GL_STUB(glCombinerParameterfNV, 744)
-	GL_STUB(glCombinerParameterfvNV, 745)
-	GL_STUB(glCombinerParameteriNV, 746)
-	GL_STUB(glCombinerParameterivNV, 747)
-	GL_STUB(glFinalCombinerInputNV, 748)
-	GL_STUB(glGetCombinerInputParameterfvNV, 749)
-	GL_STUB(glGetCombinerInputParameterivNV, 750)
-	GL_STUB(glGetCombinerOutputParameterfvNV, 751)
-	GL_STUB(glGetCombinerOutputParameterivNV, 752)
-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 753)
-	GL_STUB(glGetFinalCombinerInputParameterivNV, 754)
-	GL_STUB(glResizeBuffersMESA, 755)
-	GL_STUB(glWindowPos2dMESA, 756)
-	GL_STUB(glWindowPos2dvMESA, 757)
-	GL_STUB(glWindowPos2fMESA, 758)
-	GL_STUB(glWindowPos2fvMESA, 759)
-	GL_STUB(glWindowPos2iMESA, 760)
-	GL_STUB(glWindowPos2ivMESA, 761)
-	GL_STUB(glWindowPos2sMESA, 762)
-	GL_STUB(glWindowPos2svMESA, 763)
-	GL_STUB(glWindowPos3dMESA, 764)
-	GL_STUB(glWindowPos3dvMESA, 765)
-	GL_STUB(glWindowPos3fMESA, 766)
-	GL_STUB(glWindowPos3fvMESA, 767)
-	GL_STUB(glWindowPos3iMESA, 768)
-	GL_STUB(glWindowPos3ivMESA, 769)
-	GL_STUB(glWindowPos3sMESA, 770)
-	GL_STUB(glWindowPos3svMESA, 771)
-	GL_STUB(glWindowPos4dMESA, 772)
-	GL_STUB(glWindowPos4dvMESA, 773)
-	GL_STUB(glWindowPos4fMESA, 774)
-	GL_STUB(glWindowPos4fvMESA, 775)
-	GL_STUB(glWindowPos4iMESA, 776)
-	GL_STUB(glWindowPos4ivMESA, 777)
-	GL_STUB(glWindowPos4sMESA, 778)
-	GL_STUB(glWindowPos4svMESA, 779)
-	GL_STUB(gl_dispatch_stub_780, 780)
-	HIDDEN(gl_dispatch_stub_780)
-	GL_STUB(gl_dispatch_stub_781, 781)
-	HIDDEN(gl_dispatch_stub_781)
+	GL_STUB(gl_dispatch_stub_704, 704)
+	HIDDEN(gl_dispatch_stub_704)
+	GL_STUB(gl_dispatch_stub_705, 705)
+	HIDDEN(gl_dispatch_stub_705)
+	GL_STUB(glColorPointerEXT, 706)
+	GL_STUB(glEdgeFlagPointerEXT, 707)
+	GL_STUB(glIndexPointerEXT, 708)
+	GL_STUB(glNormalPointerEXT, 709)
+	GL_STUB(glTexCoordPointerEXT, 710)
+	GL_STUB(glVertexPointerEXT, 711)
+	GL_STUB(glPointParameterfEXT, 712)
+	GL_STUB(glPointParameterfvEXT, 713)
+	GL_STUB(glLockArraysEXT, 714)
+	GL_STUB(glUnlockArraysEXT, 715)
+	GL_STUB(glSecondaryColor3bEXT, 716)
+	GL_STUB(glSecondaryColor3bvEXT, 717)
+	GL_STUB(glSecondaryColor3dEXT, 718)
+	GL_STUB(glSecondaryColor3dvEXT, 719)
+	GL_STUB(glSecondaryColor3fEXT, 720)
+	GL_STUB(glSecondaryColor3fvEXT, 721)
+	GL_STUB(glSecondaryColor3iEXT, 722)
+	GL_STUB(glSecondaryColor3ivEXT, 723)
+	GL_STUB(glSecondaryColor3sEXT, 724)
+	GL_STUB(glSecondaryColor3svEXT, 725)
+	GL_STUB(glSecondaryColor3ubEXT, 726)
+	GL_STUB(glSecondaryColor3ubvEXT, 727)
+	GL_STUB(glSecondaryColor3uiEXT, 728)
+	GL_STUB(glSecondaryColor3uivEXT, 729)
+	GL_STUB(glSecondaryColor3usEXT, 730)
+	GL_STUB(glSecondaryColor3usvEXT, 731)
+	GL_STUB(glSecondaryColorPointerEXT, 732)
+	GL_STUB(glMultiDrawArraysEXT, 733)
+	GL_STUB(glMultiDrawElementsEXT, 734)
+	GL_STUB(glFogCoordPointerEXT, 735)
+	GL_STUB(glFogCoorddEXT, 736)
+	GL_STUB(glFogCoorddvEXT, 737)
+	GL_STUB(glFogCoordfEXT, 738)
+	GL_STUB(glFogCoordfvEXT, 739)
+	GL_STUB(gl_dispatch_stub_740, 740)
+	HIDDEN(gl_dispatch_stub_740)
+	GL_STUB(glBlendFuncSeparateEXT, 741)
+	GL_STUB(glFlushVertexArrayRangeNV, 742)
+	GL_STUB(glVertexArrayRangeNV, 743)
+	GL_STUB(glCombinerInputNV, 744)
+	GL_STUB(glCombinerOutputNV, 745)
+	GL_STUB(glCombinerParameterfNV, 746)
+	GL_STUB(glCombinerParameterfvNV, 747)
+	GL_STUB(glCombinerParameteriNV, 748)
+	GL_STUB(glCombinerParameterivNV, 749)
+	GL_STUB(glFinalCombinerInputNV, 750)
+	GL_STUB(glGetCombinerInputParameterfvNV, 751)
+	GL_STUB(glGetCombinerInputParameterivNV, 752)
+	GL_STUB(glGetCombinerOutputParameterfvNV, 753)
+	GL_STUB(glGetCombinerOutputParameterivNV, 754)
+	GL_STUB(glGetFinalCombinerInputParameterfvNV, 755)
+	GL_STUB(glGetFinalCombinerInputParameterivNV, 756)
+	GL_STUB(glResizeBuffersMESA, 757)
+	GL_STUB(glWindowPos2dMESA, 758)
+	GL_STUB(glWindowPos2dvMESA, 759)
+	GL_STUB(glWindowPos2fMESA, 760)
+	GL_STUB(glWindowPos2fvMESA, 761)
+	GL_STUB(glWindowPos2iMESA, 762)
+	GL_STUB(glWindowPos2ivMESA, 763)
+	GL_STUB(glWindowPos2sMESA, 764)
+	GL_STUB(glWindowPos2svMESA, 765)
+	GL_STUB(glWindowPos3dMESA, 766)
+	GL_STUB(glWindowPos3dvMESA, 767)
+	GL_STUB(glWindowPos3fMESA, 768)
+	GL_STUB(glWindowPos3fvMESA, 769)
+	GL_STUB(glWindowPos3iMESA, 770)
+	GL_STUB(glWindowPos3ivMESA, 771)
+	GL_STUB(glWindowPos3sMESA, 772)
+	GL_STUB(glWindowPos3svMESA, 773)
+	GL_STUB(glWindowPos4dMESA, 774)
+	GL_STUB(glWindowPos4dvMESA, 775)
+	GL_STUB(glWindowPos4fMESA, 776)
+	GL_STUB(glWindowPos4fvMESA, 777)
+	GL_STUB(glWindowPos4iMESA, 778)
+	GL_STUB(glWindowPos4ivMESA, 779)
+	GL_STUB(glWindowPos4sMESA, 780)
+	GL_STUB(glWindowPos4svMESA, 781)
 	GL_STUB(gl_dispatch_stub_782, 782)
 	HIDDEN(gl_dispatch_stub_782)
 	GL_STUB(gl_dispatch_stub_783, 783)
@@ -1002,211 +1000,215 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_787)
 	GL_STUB(gl_dispatch_stub_788, 788)
 	HIDDEN(gl_dispatch_stub_788)
-	GL_STUB(glAreProgramsResidentNV, 789)
-	GL_STUB(glBindProgramNV, 790)
-	GL_STUB(glDeleteProgramsNV, 791)
-	GL_STUB(glExecuteProgramNV, 792)
-	GL_STUB(glGenProgramsNV, 793)
-	GL_STUB(glGetProgramParameterdvNV, 794)
-	GL_STUB(glGetProgramParameterfvNV, 795)
-	GL_STUB(glGetProgramStringNV, 796)
-	GL_STUB(glGetProgramivNV, 797)
-	GL_STUB(glGetTrackMatrixivNV, 798)
-	GL_STUB(glGetVertexAttribPointervNV, 799)
-	GL_STUB(glGetVertexAttribdvNV, 800)
-	GL_STUB(glGetVertexAttribfvNV, 801)
-	GL_STUB(glGetVertexAttribivNV, 802)
-	GL_STUB(glIsProgramNV, 803)
-	GL_STUB(glLoadProgramNV, 804)
-	GL_STUB(glProgramParameters4dvNV, 805)
-	GL_STUB(glProgramParameters4fvNV, 806)
-	GL_STUB(glRequestResidentProgramsNV, 807)
-	GL_STUB(glTrackMatrixNV, 808)
-	GL_STUB(glVertexAttrib1dNV, 809)
-	GL_STUB(glVertexAttrib1dvNV, 810)
-	GL_STUB(glVertexAttrib1fNV, 811)
-	GL_STUB(glVertexAttrib1fvNV, 812)
-	GL_STUB(glVertexAttrib1sNV, 813)
-	GL_STUB(glVertexAttrib1svNV, 814)
-	GL_STUB(glVertexAttrib2dNV, 815)
-	GL_STUB(glVertexAttrib2dvNV, 816)
-	GL_STUB(glVertexAttrib2fNV, 817)
-	GL_STUB(glVertexAttrib2fvNV, 818)
-	GL_STUB(glVertexAttrib2sNV, 819)
-	GL_STUB(glVertexAttrib2svNV, 820)
-	GL_STUB(glVertexAttrib3dNV, 821)
-	GL_STUB(glVertexAttrib3dvNV, 822)
-	GL_STUB(glVertexAttrib3fNV, 823)
-	GL_STUB(glVertexAttrib3fvNV, 824)
-	GL_STUB(glVertexAttrib3sNV, 825)
-	GL_STUB(glVertexAttrib3svNV, 826)
-	GL_STUB(glVertexAttrib4dNV, 827)
-	GL_STUB(glVertexAttrib4dvNV, 828)
-	GL_STUB(glVertexAttrib4fNV, 829)
-	GL_STUB(glVertexAttrib4fvNV, 830)
-	GL_STUB(glVertexAttrib4sNV, 831)
-	GL_STUB(glVertexAttrib4svNV, 832)
-	GL_STUB(glVertexAttrib4ubNV, 833)
-	GL_STUB(glVertexAttrib4ubvNV, 834)
-	GL_STUB(glVertexAttribPointerNV, 835)
-	GL_STUB(glVertexAttribs1dvNV, 836)
-	GL_STUB(glVertexAttribs1fvNV, 837)
-	GL_STUB(glVertexAttribs1svNV, 838)
-	GL_STUB(glVertexAttribs2dvNV, 839)
-	GL_STUB(glVertexAttribs2fvNV, 840)
-	GL_STUB(glVertexAttribs2svNV, 841)
-	GL_STUB(glVertexAttribs3dvNV, 842)
-	GL_STUB(glVertexAttribs3fvNV, 843)
-	GL_STUB(glVertexAttribs3svNV, 844)
-	GL_STUB(glVertexAttribs4dvNV, 845)
-	GL_STUB(glVertexAttribs4fvNV, 846)
-	GL_STUB(glVertexAttribs4svNV, 847)
-	GL_STUB(glVertexAttribs4ubvNV, 848)
-	GL_STUB(glGetTexBumpParameterfvATI, 849)
-	GL_STUB(glGetTexBumpParameterivATI, 850)
-	GL_STUB(glTexBumpParameterfvATI, 851)
-	GL_STUB(glTexBumpParameterivATI, 852)
-	GL_STUB(glAlphaFragmentOp1ATI, 853)
-	GL_STUB(glAlphaFragmentOp2ATI, 854)
-	GL_STUB(glAlphaFragmentOp3ATI, 855)
-	GL_STUB(glBeginFragmentShaderATI, 856)
-	GL_STUB(glBindFragmentShaderATI, 857)
-	GL_STUB(glColorFragmentOp1ATI, 858)
-	GL_STUB(glColorFragmentOp2ATI, 859)
-	GL_STUB(glColorFragmentOp3ATI, 860)
-	GL_STUB(glDeleteFragmentShaderATI, 861)
-	GL_STUB(glEndFragmentShaderATI, 862)
-	GL_STUB(glGenFragmentShadersATI, 863)
-	GL_STUB(glPassTexCoordATI, 864)
-	GL_STUB(glSampleMapATI, 865)
-	GL_STUB(glSetFragmentShaderConstantATI, 866)
-	GL_STUB(glPointParameteriNV, 867)
-	GL_STUB(glPointParameterivNV, 868)
-	GL_STUB(gl_dispatch_stub_869, 869)
-	HIDDEN(gl_dispatch_stub_869)
-	GL_STUB(gl_dispatch_stub_870, 870)
-	HIDDEN(gl_dispatch_stub_870)
+	GL_STUB(gl_dispatch_stub_789, 789)
+	HIDDEN(gl_dispatch_stub_789)
+	GL_STUB(gl_dispatch_stub_790, 790)
+	HIDDEN(gl_dispatch_stub_790)
+	GL_STUB(glAreProgramsResidentNV, 791)
+	GL_STUB(glBindProgramNV, 792)
+	GL_STUB(glDeleteProgramsNV, 793)
+	GL_STUB(glExecuteProgramNV, 794)
+	GL_STUB(glGenProgramsNV, 795)
+	GL_STUB(glGetProgramParameterdvNV, 796)
+	GL_STUB(glGetProgramParameterfvNV, 797)
+	GL_STUB(glGetProgramStringNV, 798)
+	GL_STUB(glGetProgramivNV, 799)
+	GL_STUB(glGetTrackMatrixivNV, 800)
+	GL_STUB(glGetVertexAttribPointervNV, 801)
+	GL_STUB(glGetVertexAttribdvNV, 802)
+	GL_STUB(glGetVertexAttribfvNV, 803)
+	GL_STUB(glGetVertexAttribivNV, 804)
+	GL_STUB(glIsProgramNV, 805)
+	GL_STUB(glLoadProgramNV, 806)
+	GL_STUB(glProgramParameters4dvNV, 807)
+	GL_STUB(glProgramParameters4fvNV, 808)
+	GL_STUB(glRequestResidentProgramsNV, 809)
+	GL_STUB(glTrackMatrixNV, 810)
+	GL_STUB(glVertexAttrib1dNV, 811)
+	GL_STUB(glVertexAttrib1dvNV, 812)
+	GL_STUB(glVertexAttrib1fNV, 813)
+	GL_STUB(glVertexAttrib1fvNV, 814)
+	GL_STUB(glVertexAttrib1sNV, 815)
+	GL_STUB(glVertexAttrib1svNV, 816)
+	GL_STUB(glVertexAttrib2dNV, 817)
+	GL_STUB(glVertexAttrib2dvNV, 818)
+	GL_STUB(glVertexAttrib2fNV, 819)
+	GL_STUB(glVertexAttrib2fvNV, 820)
+	GL_STUB(glVertexAttrib2sNV, 821)
+	GL_STUB(glVertexAttrib2svNV, 822)
+	GL_STUB(glVertexAttrib3dNV, 823)
+	GL_STUB(glVertexAttrib3dvNV, 824)
+	GL_STUB(glVertexAttrib3fNV, 825)
+	GL_STUB(glVertexAttrib3fvNV, 826)
+	GL_STUB(glVertexAttrib3sNV, 827)
+	GL_STUB(glVertexAttrib3svNV, 828)
+	GL_STUB(glVertexAttrib4dNV, 829)
+	GL_STUB(glVertexAttrib4dvNV, 830)
+	GL_STUB(glVertexAttrib4fNV, 831)
+	GL_STUB(glVertexAttrib4fvNV, 832)
+	GL_STUB(glVertexAttrib4sNV, 833)
+	GL_STUB(glVertexAttrib4svNV, 834)
+	GL_STUB(glVertexAttrib4ubNV, 835)
+	GL_STUB(glVertexAttrib4ubvNV, 836)
+	GL_STUB(glVertexAttribPointerNV, 837)
+	GL_STUB(glVertexAttribs1dvNV, 838)
+	GL_STUB(glVertexAttribs1fvNV, 839)
+	GL_STUB(glVertexAttribs1svNV, 840)
+	GL_STUB(glVertexAttribs2dvNV, 841)
+	GL_STUB(glVertexAttribs2fvNV, 842)
+	GL_STUB(glVertexAttribs2svNV, 843)
+	GL_STUB(glVertexAttribs3dvNV, 844)
+	GL_STUB(glVertexAttribs3fvNV, 845)
+	GL_STUB(glVertexAttribs3svNV, 846)
+	GL_STUB(glVertexAttribs4dvNV, 847)
+	GL_STUB(glVertexAttribs4fvNV, 848)
+	GL_STUB(glVertexAttribs4svNV, 849)
+	GL_STUB(glVertexAttribs4ubvNV, 850)
+	GL_STUB(glGetTexBumpParameterfvATI, 851)
+	GL_STUB(glGetTexBumpParameterivATI, 852)
+	GL_STUB(glTexBumpParameterfvATI, 853)
+	GL_STUB(glTexBumpParameterivATI, 854)
+	GL_STUB(glAlphaFragmentOp1ATI, 855)
+	GL_STUB(glAlphaFragmentOp2ATI, 856)
+	GL_STUB(glAlphaFragmentOp3ATI, 857)
+	GL_STUB(glBeginFragmentShaderATI, 858)
+	GL_STUB(glBindFragmentShaderATI, 859)
+	GL_STUB(glColorFragmentOp1ATI, 860)
+	GL_STUB(glColorFragmentOp2ATI, 861)
+	GL_STUB(glColorFragmentOp3ATI, 862)
+	GL_STUB(glDeleteFragmentShaderATI, 863)
+	GL_STUB(glEndFragmentShaderATI, 864)
+	GL_STUB(glGenFragmentShadersATI, 865)
+	GL_STUB(glPassTexCoordATI, 866)
+	GL_STUB(glSampleMapATI, 867)
+	GL_STUB(glSetFragmentShaderConstantATI, 868)
+	GL_STUB(glPointParameteriNV, 869)
+	GL_STUB(glPointParameterivNV, 870)
 	GL_STUB(gl_dispatch_stub_871, 871)
 	HIDDEN(gl_dispatch_stub_871)
 	GL_STUB(gl_dispatch_stub_872, 872)
 	HIDDEN(gl_dispatch_stub_872)
 	GL_STUB(gl_dispatch_stub_873, 873)
 	HIDDEN(gl_dispatch_stub_873)
-	GL_STUB(glGetProgramNamedParameterdvNV, 874)
-	GL_STUB(glGetProgramNamedParameterfvNV, 875)
-	GL_STUB(glProgramNamedParameter4dNV, 876)
-	GL_STUB(glProgramNamedParameter4dvNV, 877)
-	GL_STUB(glProgramNamedParameter4fNV, 878)
-	GL_STUB(glProgramNamedParameter4fvNV, 879)
-	GL_STUB(glPrimitiveRestartIndexNV, 880)
-	GL_STUB(glPrimitiveRestartNV, 881)
-	GL_STUB(gl_dispatch_stub_882, 882)
-	HIDDEN(gl_dispatch_stub_882)
-	GL_STUB(gl_dispatch_stub_883, 883)
-	HIDDEN(gl_dispatch_stub_883)
-	GL_STUB(glBindFramebufferEXT, 884)
-	GL_STUB(glBindRenderbufferEXT, 885)
-	GL_STUB(glCheckFramebufferStatusEXT, 886)
-	GL_STUB(glDeleteFramebuffersEXT, 887)
-	GL_STUB(glDeleteRenderbuffersEXT, 888)
-	GL_STUB(glFramebufferRenderbufferEXT, 889)
-	GL_STUB(glFramebufferTexture1DEXT, 890)
-	GL_STUB(glFramebufferTexture2DEXT, 891)
-	GL_STUB(glFramebufferTexture3DEXT, 892)
-	GL_STUB(glGenFramebuffersEXT, 893)
-	GL_STUB(glGenRenderbuffersEXT, 894)
-	GL_STUB(glGenerateMipmapEXT, 895)
-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 896)
-	GL_STUB(glGetRenderbufferParameterivEXT, 897)
-	GL_STUB(glIsFramebufferEXT, 898)
-	GL_STUB(glIsRenderbufferEXT, 899)
-	GL_STUB(glRenderbufferStorageEXT, 900)
-	GL_STUB(gl_dispatch_stub_901, 901)
-	HIDDEN(gl_dispatch_stub_901)
-	GL_STUB(gl_dispatch_stub_902, 902)
-	HIDDEN(gl_dispatch_stub_902)
+	GL_STUB(gl_dispatch_stub_874, 874)
+	HIDDEN(gl_dispatch_stub_874)
+	GL_STUB(gl_dispatch_stub_875, 875)
+	HIDDEN(gl_dispatch_stub_875)
+	GL_STUB(glGetProgramNamedParameterdvNV, 876)
+	GL_STUB(glGetProgramNamedParameterfvNV, 877)
+	GL_STUB(glProgramNamedParameter4dNV, 878)
+	GL_STUB(glProgramNamedParameter4dvNV, 879)
+	GL_STUB(glProgramNamedParameter4fNV, 880)
+	GL_STUB(glProgramNamedParameter4fvNV, 881)
+	GL_STUB(glPrimitiveRestartIndexNV, 882)
+	GL_STUB(glPrimitiveRestartNV, 883)
+	GL_STUB(gl_dispatch_stub_884, 884)
+	HIDDEN(gl_dispatch_stub_884)
+	GL_STUB(gl_dispatch_stub_885, 885)
+	HIDDEN(gl_dispatch_stub_885)
+	GL_STUB(glBindFramebufferEXT, 886)
+	GL_STUB(glBindRenderbufferEXT, 887)
+	GL_STUB(glCheckFramebufferStatusEXT, 888)
+	GL_STUB(glDeleteFramebuffersEXT, 889)
+	GL_STUB(glDeleteRenderbuffersEXT, 890)
+	GL_STUB(glFramebufferRenderbufferEXT, 891)
+	GL_STUB(glFramebufferTexture1DEXT, 892)
+	GL_STUB(glFramebufferTexture2DEXT, 893)
+	GL_STUB(glFramebufferTexture3DEXT, 894)
+	GL_STUB(glGenFramebuffersEXT, 895)
+	GL_STUB(glGenRenderbuffersEXT, 896)
+	GL_STUB(glGenerateMipmapEXT, 897)
+	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 898)
+	GL_STUB(glGetRenderbufferParameterivEXT, 899)
+	GL_STUB(glIsFramebufferEXT, 900)
+	GL_STUB(glIsRenderbufferEXT, 901)
+	GL_STUB(glRenderbufferStorageEXT, 902)
 	GL_STUB(gl_dispatch_stub_903, 903)
 	HIDDEN(gl_dispatch_stub_903)
-	GL_STUB(glBindFragDataLocationEXT, 904)
-	GL_STUB(glGetFragDataLocationEXT, 905)
-	GL_STUB(glGetUniformuivEXT, 906)
-	GL_STUB(glGetVertexAttribIivEXT, 907)
-	GL_STUB(glGetVertexAttribIuivEXT, 908)
-	GL_STUB(glUniform1uiEXT, 909)
-	GL_STUB(glUniform1uivEXT, 910)
-	GL_STUB(glUniform2uiEXT, 911)
-	GL_STUB(glUniform2uivEXT, 912)
-	GL_STUB(glUniform3uiEXT, 913)
-	GL_STUB(glUniform3uivEXT, 914)
-	GL_STUB(glUniform4uiEXT, 915)
-	GL_STUB(glUniform4uivEXT, 916)
-	GL_STUB(glVertexAttribI1iEXT, 917)
-	GL_STUB(glVertexAttribI1ivEXT, 918)
-	GL_STUB(glVertexAttribI1uiEXT, 919)
-	GL_STUB(glVertexAttribI1uivEXT, 920)
-	GL_STUB(glVertexAttribI2iEXT, 921)
-	GL_STUB(glVertexAttribI2ivEXT, 922)
-	GL_STUB(glVertexAttribI2uiEXT, 923)
-	GL_STUB(glVertexAttribI2uivEXT, 924)
-	GL_STUB(glVertexAttribI3iEXT, 925)
-	GL_STUB(glVertexAttribI3ivEXT, 926)
-	GL_STUB(glVertexAttribI3uiEXT, 927)
-	GL_STUB(glVertexAttribI3uivEXT, 928)
-	GL_STUB(glVertexAttribI4bvEXT, 929)
-	GL_STUB(glVertexAttribI4iEXT, 930)
-	GL_STUB(glVertexAttribI4ivEXT, 931)
-	GL_STUB(glVertexAttribI4svEXT, 932)
-	GL_STUB(glVertexAttribI4ubvEXT, 933)
-	GL_STUB(glVertexAttribI4uiEXT, 934)
-	GL_STUB(glVertexAttribI4uivEXT, 935)
-	GL_STUB(glVertexAttribI4usvEXT, 936)
-	GL_STUB(glVertexAttribIPointerEXT, 937)
-	GL_STUB(glFramebufferTextureLayerEXT, 938)
-	GL_STUB(glColorMaskIndexedEXT, 939)
-	GL_STUB(glDisableIndexedEXT, 940)
-	GL_STUB(glEnableIndexedEXT, 941)
-	GL_STUB(glGetBooleanIndexedvEXT, 942)
-	GL_STUB(glGetIntegerIndexedvEXT, 943)
-	GL_STUB(glIsEnabledIndexedEXT, 944)
-	GL_STUB(glClearColorIiEXT, 945)
-	GL_STUB(glClearColorIuiEXT, 946)
-	GL_STUB(glGetTexParameterIivEXT, 947)
-	GL_STUB(glGetTexParameterIuivEXT, 948)
-	GL_STUB(glTexParameterIivEXT, 949)
-	GL_STUB(glTexParameterIuivEXT, 950)
-	GL_STUB(glBeginConditionalRenderNV, 951)
-	GL_STUB(glEndConditionalRenderNV, 952)
-	GL_STUB(glBeginTransformFeedbackEXT, 953)
-	GL_STUB(glBindBufferBaseEXT, 954)
-	GL_STUB(glBindBufferOffsetEXT, 955)
-	GL_STUB(glBindBufferRangeEXT, 956)
-	GL_STUB(glEndTransformFeedbackEXT, 957)
-	GL_STUB(glGetTransformFeedbackVaryingEXT, 958)
-	GL_STUB(glTransformFeedbackVaryingsEXT, 959)
-	GL_STUB(glProvokingVertexEXT, 960)
-	GL_STUB(gl_dispatch_stub_961, 961)
-	HIDDEN(gl_dispatch_stub_961)
-	GL_STUB(gl_dispatch_stub_962, 962)
-	HIDDEN(gl_dispatch_stub_962)
-	GL_STUB(glGetObjectParameterivAPPLE, 963)
-	GL_STUB(glObjectPurgeableAPPLE, 964)
-	GL_STUB(glObjectUnpurgeableAPPLE, 965)
-	GL_STUB(glActiveProgramEXT, 966)
-	GL_STUB(glCreateShaderProgramEXT, 967)
-	GL_STUB(glUseShaderProgramEXT, 968)
-	GL_STUB(glTextureBarrierNV, 969)
-	GL_STUB(gl_dispatch_stub_970, 970)
-	HIDDEN(gl_dispatch_stub_970)
-	GL_STUB(gl_dispatch_stub_971, 971)
-	HIDDEN(gl_dispatch_stub_971)
+	GL_STUB(gl_dispatch_stub_904, 904)
+	HIDDEN(gl_dispatch_stub_904)
+	GL_STUB(gl_dispatch_stub_905, 905)
+	HIDDEN(gl_dispatch_stub_905)
+	GL_STUB(glBindFragDataLocationEXT, 906)
+	GL_STUB(glGetFragDataLocationEXT, 907)
+	GL_STUB(glGetUniformuivEXT, 908)
+	GL_STUB(glGetVertexAttribIivEXT, 909)
+	GL_STUB(glGetVertexAttribIuivEXT, 910)
+	GL_STUB(glUniform1uiEXT, 911)
+	GL_STUB(glUniform1uivEXT, 912)
+	GL_STUB(glUniform2uiEXT, 913)
+	GL_STUB(glUniform2uivEXT, 914)
+	GL_STUB(glUniform3uiEXT, 915)
+	GL_STUB(glUniform3uivEXT, 916)
+	GL_STUB(glUniform4uiEXT, 917)
+	GL_STUB(glUniform4uivEXT, 918)
+	GL_STUB(glVertexAttribI1iEXT, 919)
+	GL_STUB(glVertexAttribI1ivEXT, 920)
+	GL_STUB(glVertexAttribI1uiEXT, 921)
+	GL_STUB(glVertexAttribI1uivEXT, 922)
+	GL_STUB(glVertexAttribI2iEXT, 923)
+	GL_STUB(glVertexAttribI2ivEXT, 924)
+	GL_STUB(glVertexAttribI2uiEXT, 925)
+	GL_STUB(glVertexAttribI2uivEXT, 926)
+	GL_STUB(glVertexAttribI3iEXT, 927)
+	GL_STUB(glVertexAttribI3ivEXT, 928)
+	GL_STUB(glVertexAttribI3uiEXT, 929)
+	GL_STUB(glVertexAttribI3uivEXT, 930)
+	GL_STUB(glVertexAttribI4bvEXT, 931)
+	GL_STUB(glVertexAttribI4iEXT, 932)
+	GL_STUB(glVertexAttribI4ivEXT, 933)
+	GL_STUB(glVertexAttribI4svEXT, 934)
+	GL_STUB(glVertexAttribI4ubvEXT, 935)
+	GL_STUB(glVertexAttribI4uiEXT, 936)
+	GL_STUB(glVertexAttribI4uivEXT, 937)
+	GL_STUB(glVertexAttribI4usvEXT, 938)
+	GL_STUB(glVertexAttribIPointerEXT, 939)
+	GL_STUB(glFramebufferTextureLayerEXT, 940)
+	GL_STUB(glColorMaskIndexedEXT, 941)
+	GL_STUB(glDisableIndexedEXT, 942)
+	GL_STUB(glEnableIndexedEXT, 943)
+	GL_STUB(glGetBooleanIndexedvEXT, 944)
+	GL_STUB(glGetIntegerIndexedvEXT, 945)
+	GL_STUB(glIsEnabledIndexedEXT, 946)
+	GL_STUB(glClearColorIiEXT, 947)
+	GL_STUB(glClearColorIuiEXT, 948)
+	GL_STUB(glGetTexParameterIivEXT, 949)
+	GL_STUB(glGetTexParameterIuivEXT, 950)
+	GL_STUB(glTexParameterIivEXT, 951)
+	GL_STUB(glTexParameterIuivEXT, 952)
+	GL_STUB(glBeginConditionalRenderNV, 953)
+	GL_STUB(glEndConditionalRenderNV, 954)
+	GL_STUB(glBeginTransformFeedbackEXT, 955)
+	GL_STUB(glBindBufferBaseEXT, 956)
+	GL_STUB(glBindBufferOffsetEXT, 957)
+	GL_STUB(glBindBufferRangeEXT, 958)
+	GL_STUB(glEndTransformFeedbackEXT, 959)
+	GL_STUB(glGetTransformFeedbackVaryingEXT, 960)
+	GL_STUB(glTransformFeedbackVaryingsEXT, 961)
+	GL_STUB(glProvokingVertexEXT, 962)
+	GL_STUB(gl_dispatch_stub_963, 963)
+	HIDDEN(gl_dispatch_stub_963)
+	GL_STUB(gl_dispatch_stub_964, 964)
+	HIDDEN(gl_dispatch_stub_964)
+	GL_STUB(glGetObjectParameterivAPPLE, 965)
+	GL_STUB(glObjectPurgeableAPPLE, 966)
+	GL_STUB(glObjectUnpurgeableAPPLE, 967)
+	GL_STUB(glActiveProgramEXT, 968)
+	GL_STUB(glCreateShaderProgramEXT, 969)
+	GL_STUB(glUseShaderProgramEXT, 970)
+	GL_STUB(glTextureBarrierNV, 971)
 	GL_STUB(gl_dispatch_stub_972, 972)
 	HIDDEN(gl_dispatch_stub_972)
 	GL_STUB(gl_dispatch_stub_973, 973)
 	HIDDEN(gl_dispatch_stub_973)
 	GL_STUB(gl_dispatch_stub_974, 974)
 	HIDDEN(gl_dispatch_stub_974)
-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 975)
-	GL_STUB(glEGLImageTargetTexture2DOES, 976)
+	GL_STUB(gl_dispatch_stub_975, 975)
+	HIDDEN(gl_dispatch_stub_975)
+	GL_STUB(gl_dispatch_stub_976, 976)
+	HIDDEN(gl_dispatch_stub_976)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 977)
+	GL_STUB(glEGLImageTargetTexture2DOES, 978)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/mesalib/src/mapi/glapi/glapi_x86-64.S b/mesalib/src/mapi/glapi/glapi_x86-64.S
index 8ea2a3b44..afcd2638f 100644
--- a/mesalib/src/mapi/glapi/glapi_x86-64.S
+++ b/mesalib/src/mapi/glapi/glapi_x86-64.S
@@ -22713,9 +22713,9 @@ GL_PREFIX(BlendFunciARB):
 	.size	GL_PREFIX(BlendFunciARB), .-GL_PREFIX(BlendFunciARB)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(BindSampler)
-	.type	GL_PREFIX(BindSampler), @function
-GL_PREFIX(BindSampler):
+	.globl	GL_PREFIX(BindFragDataLocationIndexed)
+	.type	GL_PREFIX(BindFragDataLocationIndexed), @function
+GL_PREFIX(BindFragDataLocationIndexed):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4808(%rax), %r11
@@ -22723,9 +22723,13 @@ GL_PREFIX(BindSampler):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	4808(%rax), %r11
@@ -22739,20 +22743,24 @@ GL_PREFIX(BindSampler):
 1:
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(BindSampler), .-GL_PREFIX(BindSampler)
+	.size	GL_PREFIX(BindFragDataLocationIndexed), .-GL_PREFIX(BindFragDataLocationIndexed)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(DeleteSamplers)
-	.type	GL_PREFIX(DeleteSamplers), @function
-GL_PREFIX(DeleteSamplers):
+	.globl	GL_PREFIX(GetFragDataIndex)
+	.type	GL_PREFIX(GetFragDataIndex), @function
+GL_PREFIX(GetFragDataIndex):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4816(%rax), %r11
@@ -22784,12 +22792,12 @@ GL_PREFIX(DeleteSamplers):
 	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(DeleteSamplers), .-GL_PREFIX(DeleteSamplers)
+	.size	GL_PREFIX(GetFragDataIndex), .-GL_PREFIX(GetFragDataIndex)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(GenSamplers)
-	.type	GL_PREFIX(GenSamplers), @function
-GL_PREFIX(GenSamplers):
+	.globl	GL_PREFIX(BindSampler)
+	.type	GL_PREFIX(BindSampler), @function
+GL_PREFIX(BindSampler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	4824(%rax), %r11
@@ -22821,6 +22829,80 @@ GL_PREFIX(GenSamplers):
 	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(BindSampler), .-GL_PREFIX(BindSampler)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(DeleteSamplers)
+	.type	GL_PREFIX(DeleteSamplers), @function
+GL_PREFIX(DeleteSamplers):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4832(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4832(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4832(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4832(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(DeleteSamplers), .-GL_PREFIX(DeleteSamplers)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GenSamplers)
+	.type	GL_PREFIX(GenSamplers), @function
+GL_PREFIX(GenSamplers):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4840(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4840(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4840(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4840(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenSamplers), .-GL_PREFIX(GenSamplers)
 
 	.p2align	4,,15
@@ -22829,7 +22911,7 @@ GL_PREFIX(GenSamplers):
 GL_PREFIX(GetSamplerParameterIiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22839,13 +22921,13 @@ GL_PREFIX(GetSamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22855,7 +22937,7 @@ GL_PREFIX(GetSamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameterIiv), .-GL_PREFIX(GetSamplerParameterIiv)
@@ -22866,7 +22948,7 @@ GL_PREFIX(GetSamplerParameterIiv):
 GL_PREFIX(GetSamplerParameterIuiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22876,13 +22958,13 @@ GL_PREFIX(GetSamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22892,7 +22974,7 @@ GL_PREFIX(GetSamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameterIuiv), .-GL_PREFIX(GetSamplerParameterIuiv)
@@ -22903,7 +22985,7 @@ GL_PREFIX(GetSamplerParameterIuiv):
 GL_PREFIX(GetSamplerParameterfv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22913,13 +22995,13 @@ GL_PREFIX(GetSamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22929,7 +23011,7 @@ GL_PREFIX(GetSamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameterfv), .-GL_PREFIX(GetSamplerParameterfv)
@@ -22940,7 +23022,7 @@ GL_PREFIX(GetSamplerParameterfv):
 GL_PREFIX(GetSamplerParameteriv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22950,13 +23032,13 @@ GL_PREFIX(GetSamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22966,7 +23048,7 @@ GL_PREFIX(GetSamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameteriv), .-GL_PREFIX(GetSamplerParameteriv)
@@ -22977,25 +23059,25 @@ GL_PREFIX(GetSamplerParameteriv):
 GL_PREFIX(IsSampler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsSampler), .-GL_PREFIX(IsSampler)
@@ -23006,7 +23088,7 @@ GL_PREFIX(IsSampler):
 GL_PREFIX(SamplerParameterIiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23016,13 +23098,13 @@ GL_PREFIX(SamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23032,7 +23114,7 @@ GL_PREFIX(SamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterIiv), .-GL_PREFIX(SamplerParameterIiv)
@@ -23043,7 +23125,7 @@ GL_PREFIX(SamplerParameterIiv):
 GL_PREFIX(SamplerParameterIuiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23053,13 +23135,13 @@ GL_PREFIX(SamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23069,7 +23151,7 @@ GL_PREFIX(SamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterIuiv), .-GL_PREFIX(SamplerParameterIuiv)
@@ -23080,7 +23162,7 @@ GL_PREFIX(SamplerParameterIuiv):
 GL_PREFIX(SamplerParameterf):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23092,13 +23174,13 @@ GL_PREFIX(SamplerParameterf):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23110,7 +23192,7 @@ GL_PREFIX(SamplerParameterf):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4888(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterf), .-GL_PREFIX(SamplerParameterf)
@@ -23121,7 +23203,7 @@ GL_PREFIX(SamplerParameterf):
 GL_PREFIX(SamplerParameterfv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23131,13 +23213,13 @@ GL_PREFIX(SamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23147,7 +23229,7 @@ GL_PREFIX(SamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterfv), .-GL_PREFIX(SamplerParameterfv)
@@ -23158,7 +23240,7 @@ GL_PREFIX(SamplerParameterfv):
 GL_PREFIX(SamplerParameteri):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23168,13 +23250,13 @@ GL_PREFIX(SamplerParameteri):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23184,7 +23266,7 @@ GL_PREFIX(SamplerParameteri):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameteri), .-GL_PREFIX(SamplerParameteri)
@@ -23195,7 +23277,7 @@ GL_PREFIX(SamplerParameteri):
 GL_PREFIX(SamplerParameteriv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23205,13 +23287,13 @@ GL_PREFIX(SamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23221,7 +23303,7 @@ GL_PREFIX(SamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameteriv), .-GL_PREFIX(SamplerParameteriv)
@@ -23232,7 +23314,7 @@ GL_PREFIX(SamplerParameteriv):
 GL_PREFIX(ColorP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23242,13 +23324,13 @@ GL_PREFIX(ColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23258,7 +23340,7 @@ GL_PREFIX(ColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP3ui), .-GL_PREFIX(ColorP3ui)
@@ -23269,7 +23351,7 @@ GL_PREFIX(ColorP3ui):
 GL_PREFIX(ColorP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23279,13 +23361,13 @@ GL_PREFIX(ColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23295,7 +23377,7 @@ GL_PREFIX(ColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP3uiv), .-GL_PREFIX(ColorP3uiv)
@@ -23306,7 +23388,7 @@ GL_PREFIX(ColorP3uiv):
 GL_PREFIX(ColorP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23316,13 +23398,13 @@ GL_PREFIX(ColorP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23332,7 +23414,7 @@ GL_PREFIX(ColorP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP4ui), .-GL_PREFIX(ColorP4ui)
@@ -23343,7 +23425,7 @@ GL_PREFIX(ColorP4ui):
 GL_PREFIX(ColorP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23353,13 +23435,13 @@ GL_PREFIX(ColorP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23369,7 +23451,7 @@ GL_PREFIX(ColorP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP4uiv), .-GL_PREFIX(ColorP4uiv)
@@ -23380,7 +23462,7 @@ GL_PREFIX(ColorP4uiv):
 GL_PREFIX(MultiTexCoordP1ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23390,13 +23472,13 @@ GL_PREFIX(MultiTexCoordP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23406,7 +23488,7 @@ GL_PREFIX(MultiTexCoordP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP1ui), .-GL_PREFIX(MultiTexCoordP1ui)
@@ -23417,7 +23499,7 @@ GL_PREFIX(MultiTexCoordP1ui):
 GL_PREFIX(MultiTexCoordP1uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23427,13 +23509,13 @@ GL_PREFIX(MultiTexCoordP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23443,7 +23525,7 @@ GL_PREFIX(MultiTexCoordP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP1uiv), .-GL_PREFIX(MultiTexCoordP1uiv)
@@ -23454,7 +23536,7 @@ GL_PREFIX(MultiTexCoordP1uiv):
 GL_PREFIX(MultiTexCoordP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23464,13 +23546,13 @@ GL_PREFIX(MultiTexCoordP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23480,7 +23562,7 @@ GL_PREFIX(MultiTexCoordP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP2ui), .-GL_PREFIX(MultiTexCoordP2ui)
@@ -23491,7 +23573,7 @@ GL_PREFIX(MultiTexCoordP2ui):
 GL_PREFIX(MultiTexCoordP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23501,13 +23583,13 @@ GL_PREFIX(MultiTexCoordP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23517,7 +23599,7 @@ GL_PREFIX(MultiTexCoordP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP2uiv), .-GL_PREFIX(MultiTexCoordP2uiv)
@@ -23528,7 +23610,7 @@ GL_PREFIX(MultiTexCoordP2uiv):
 GL_PREFIX(MultiTexCoordP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23538,13 +23620,13 @@ GL_PREFIX(MultiTexCoordP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23554,7 +23636,7 @@ GL_PREFIX(MultiTexCoordP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP3ui), .-GL_PREFIX(MultiTexCoordP3ui)
@@ -23565,7 +23647,7 @@ GL_PREFIX(MultiTexCoordP3ui):
 GL_PREFIX(MultiTexCoordP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23575,13 +23657,13 @@ GL_PREFIX(MultiTexCoordP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23591,7 +23673,7 @@ GL_PREFIX(MultiTexCoordP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP3uiv), .-GL_PREFIX(MultiTexCoordP3uiv)
@@ -23602,7 +23684,7 @@ GL_PREFIX(MultiTexCoordP3uiv):
 GL_PREFIX(MultiTexCoordP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23612,13 +23694,13 @@ GL_PREFIX(MultiTexCoordP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23628,7 +23710,7 @@ GL_PREFIX(MultiTexCoordP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP4ui), .-GL_PREFIX(MultiTexCoordP4ui)
@@ -23639,7 +23721,7 @@ GL_PREFIX(MultiTexCoordP4ui):
 GL_PREFIX(MultiTexCoordP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23649,13 +23731,13 @@ GL_PREFIX(MultiTexCoordP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23665,7 +23747,7 @@ GL_PREFIX(MultiTexCoordP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP4uiv), .-GL_PREFIX(MultiTexCoordP4uiv)
@@ -23676,7 +23758,7 @@ GL_PREFIX(MultiTexCoordP4uiv):
 GL_PREFIX(NormalP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23686,13 +23768,13 @@ GL_PREFIX(NormalP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23702,7 +23784,7 @@ GL_PREFIX(NormalP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalP3ui), .-GL_PREFIX(NormalP3ui)
@@ -23713,7 +23795,7 @@ GL_PREFIX(NormalP3ui):
 GL_PREFIX(NormalP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23723,13 +23805,13 @@ GL_PREFIX(NormalP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23739,7 +23821,7 @@ GL_PREFIX(NormalP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalP3uiv), .-GL_PREFIX(NormalP3uiv)
@@ -23750,7 +23832,7 @@ GL_PREFIX(NormalP3uiv):
 GL_PREFIX(SecondaryColorP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23760,13 +23842,13 @@ GL_PREFIX(SecondaryColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23776,7 +23858,7 @@ GL_PREFIX(SecondaryColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorP3ui), .-GL_PREFIX(SecondaryColorP3ui)
@@ -23787,7 +23869,7 @@ GL_PREFIX(SecondaryColorP3ui):
 GL_PREFIX(SecondaryColorP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23797,13 +23879,13 @@ GL_PREFIX(SecondaryColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23813,7 +23895,7 @@ GL_PREFIX(SecondaryColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorP3uiv), .-GL_PREFIX(SecondaryColorP3uiv)
@@ -23824,7 +23906,7 @@ GL_PREFIX(SecondaryColorP3uiv):
 GL_PREFIX(TexCoordP1ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23834,13 +23916,13 @@ GL_PREFIX(TexCoordP1ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23850,7 +23932,7 @@ GL_PREFIX(TexCoordP1ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP1ui), .-GL_PREFIX(TexCoordP1ui)
@@ -23861,7 +23943,7 @@ GL_PREFIX(TexCoordP1ui):
 GL_PREFIX(TexCoordP1uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23871,13 +23953,13 @@ GL_PREFIX(TexCoordP1uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23887,7 +23969,7 @@ GL_PREFIX(TexCoordP1uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP1uiv), .-GL_PREFIX(TexCoordP1uiv)
@@ -23898,7 +23980,7 @@ GL_PREFIX(TexCoordP1uiv):
 GL_PREFIX(TexCoordP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23908,13 +23990,13 @@ GL_PREFIX(TexCoordP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23924,7 +24006,7 @@ GL_PREFIX(TexCoordP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP2ui), .-GL_PREFIX(TexCoordP2ui)
@@ -23935,7 +24017,7 @@ GL_PREFIX(TexCoordP2ui):
 GL_PREFIX(TexCoordP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23945,13 +24027,13 @@ GL_PREFIX(TexCoordP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23961,7 +24043,7 @@ GL_PREFIX(TexCoordP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP2uiv), .-GL_PREFIX(TexCoordP2uiv)
@@ -23972,7 +24054,7 @@ GL_PREFIX(TexCoordP2uiv):
 GL_PREFIX(TexCoordP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23982,13 +24064,13 @@ GL_PREFIX(TexCoordP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23998,7 +24080,7 @@ GL_PREFIX(TexCoordP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP3ui), .-GL_PREFIX(TexCoordP3ui)
@@ -24009,7 +24091,7 @@ GL_PREFIX(TexCoordP3ui):
 GL_PREFIX(TexCoordP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24019,13 +24101,13 @@ GL_PREFIX(TexCoordP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24035,7 +24117,7 @@ GL_PREFIX(TexCoordP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP3uiv), .-GL_PREFIX(TexCoordP3uiv)
@@ -24046,7 +24128,7 @@ GL_PREFIX(TexCoordP3uiv):
 GL_PREFIX(TexCoordP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24056,13 +24138,13 @@ GL_PREFIX(TexCoordP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24072,7 +24154,7 @@ GL_PREFIX(TexCoordP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP4ui), .-GL_PREFIX(TexCoordP4ui)
@@ -24083,7 +24165,7 @@ GL_PREFIX(TexCoordP4ui):
 GL_PREFIX(TexCoordP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24093,13 +24175,13 @@ GL_PREFIX(TexCoordP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24109,7 +24191,7 @@ GL_PREFIX(TexCoordP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP4uiv), .-GL_PREFIX(TexCoordP4uiv)
@@ -24120,7 +24202,7 @@ GL_PREFIX(TexCoordP4uiv):
 GL_PREFIX(VertexAttribP1ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24134,13 +24216,13 @@ GL_PREFIX(VertexAttribP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24154,7 +24236,7 @@ GL_PREFIX(VertexAttribP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP1ui), .-GL_PREFIX(VertexAttribP1ui)
@@ -24165,7 +24247,7 @@ GL_PREFIX(VertexAttribP1ui):
 GL_PREFIX(VertexAttribP1uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24179,13 +24261,13 @@ GL_PREFIX(VertexAttribP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24199,7 +24281,7 @@ GL_PREFIX(VertexAttribP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP1uiv), .-GL_PREFIX(VertexAttribP1uiv)
@@ -24210,7 +24292,7 @@ GL_PREFIX(VertexAttribP1uiv):
 GL_PREFIX(VertexAttribP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24224,13 +24306,13 @@ GL_PREFIX(VertexAttribP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24244,7 +24326,7 @@ GL_PREFIX(VertexAttribP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP2ui), .-GL_PREFIX(VertexAttribP2ui)
@@ -24255,7 +24337,7 @@ GL_PREFIX(VertexAttribP2ui):
 GL_PREFIX(VertexAttribP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24269,13 +24351,13 @@ GL_PREFIX(VertexAttribP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24289,7 +24371,7 @@ GL_PREFIX(VertexAttribP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP2uiv), .-GL_PREFIX(VertexAttribP2uiv)
@@ -24300,7 +24382,7 @@ GL_PREFIX(VertexAttribP2uiv):
 GL_PREFIX(VertexAttribP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24314,13 +24396,13 @@ GL_PREFIX(VertexAttribP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24334,7 +24416,7 @@ GL_PREFIX(VertexAttribP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP3ui), .-GL_PREFIX(VertexAttribP3ui)
@@ -24345,7 +24427,7 @@ GL_PREFIX(VertexAttribP3ui):
 GL_PREFIX(VertexAttribP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24359,13 +24441,13 @@ GL_PREFIX(VertexAttribP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24379,7 +24461,7 @@ GL_PREFIX(VertexAttribP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP3uiv), .-GL_PREFIX(VertexAttribP3uiv)
@@ -24390,7 +24472,7 @@ GL_PREFIX(VertexAttribP3uiv):
 GL_PREFIX(VertexAttribP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24404,13 +24486,13 @@ GL_PREFIX(VertexAttribP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24424,7 +24506,7 @@ GL_PREFIX(VertexAttribP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP4ui), .-GL_PREFIX(VertexAttribP4ui)
@@ -24435,7 +24517,7 @@ GL_PREFIX(VertexAttribP4ui):
 GL_PREFIX(VertexAttribP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24449,13 +24531,13 @@ GL_PREFIX(VertexAttribP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24469,7 +24551,7 @@ GL_PREFIX(VertexAttribP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP4uiv), .-GL_PREFIX(VertexAttribP4uiv)
@@ -24480,7 +24562,7 @@ GL_PREFIX(VertexAttribP4uiv):
 GL_PREFIX(VertexP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24490,13 +24572,13 @@ GL_PREFIX(VertexP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24506,7 +24588,7 @@ GL_PREFIX(VertexP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP2ui), .-GL_PREFIX(VertexP2ui)
@@ -24517,7 +24599,7 @@ GL_PREFIX(VertexP2ui):
 GL_PREFIX(VertexP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24527,13 +24609,13 @@ GL_PREFIX(VertexP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24543,7 +24625,7 @@ GL_PREFIX(VertexP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP2uiv), .-GL_PREFIX(VertexP2uiv)
@@ -24554,7 +24636,7 @@ GL_PREFIX(VertexP2uiv):
 GL_PREFIX(VertexP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24564,13 +24646,13 @@ GL_PREFIX(VertexP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24580,7 +24662,7 @@ GL_PREFIX(VertexP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP3ui), .-GL_PREFIX(VertexP3ui)
@@ -24591,7 +24673,7 @@ GL_PREFIX(VertexP3ui):
 GL_PREFIX(VertexP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24601,13 +24683,13 @@ GL_PREFIX(VertexP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24617,7 +24699,7 @@ GL_PREFIX(VertexP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP3uiv), .-GL_PREFIX(VertexP3uiv)
@@ -24628,7 +24710,7 @@ GL_PREFIX(VertexP3uiv):
 GL_PREFIX(VertexP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24638,13 +24720,13 @@ GL_PREFIX(VertexP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24654,7 +24736,7 @@ GL_PREFIX(VertexP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP4ui), .-GL_PREFIX(VertexP4ui)
@@ -24665,7 +24747,7 @@ GL_PREFIX(VertexP4ui):
 GL_PREFIX(VertexP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24675,13 +24757,13 @@ GL_PREFIX(VertexP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24691,7 +24773,7 @@ GL_PREFIX(VertexP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP4uiv), .-GL_PREFIX(VertexP4uiv)
@@ -24702,7 +24784,7 @@ GL_PREFIX(VertexP4uiv):
 GL_PREFIX(BindTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24712,13 +24794,13 @@ GL_PREFIX(BindTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24728,7 +24810,7 @@ GL_PREFIX(BindTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindTransformFeedback), .-GL_PREFIX(BindTransformFeedback)
@@ -24739,7 +24821,7 @@ GL_PREFIX(BindTransformFeedback):
 GL_PREFIX(DeleteTransformFeedbacks):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24749,13 +24831,13 @@ GL_PREFIX(DeleteTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24765,7 +24847,7 @@ GL_PREFIX(DeleteTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteTransformFeedbacks), .-GL_PREFIX(DeleteTransformFeedbacks)
@@ -24776,7 +24858,7 @@ GL_PREFIX(DeleteTransformFeedbacks):
 GL_PREFIX(DrawTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24786,13 +24868,13 @@ GL_PREFIX(DrawTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24802,7 +24884,7 @@ GL_PREFIX(DrawTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawTransformFeedback), .-GL_PREFIX(DrawTransformFeedback)
@@ -24813,7 +24895,7 @@ GL_PREFIX(DrawTransformFeedback):
 GL_PREFIX(GenTransformFeedbacks):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24823,13 +24905,13 @@ GL_PREFIX(GenTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24839,7 +24921,7 @@ GL_PREFIX(GenTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenTransformFeedbacks), .-GL_PREFIX(GenTransformFeedbacks)
@@ -24850,25 +24932,25 @@ GL_PREFIX(GenTransformFeedbacks):
 GL_PREFIX(IsTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsTransformFeedback), .-GL_PREFIX(IsTransformFeedback)
@@ -24879,25 +24961,25 @@ GL_PREFIX(IsTransformFeedback):
 GL_PREFIX(PauseTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5264(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PauseTransformFeedback), .-GL_PREFIX(PauseTransformFeedback)
@@ -24908,25 +24990,25 @@ GL_PREFIX(PauseTransformFeedback):
 GL_PREFIX(ResumeTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5272(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResumeTransformFeedback), .-GL_PREFIX(ResumeTransformFeedback)
@@ -24937,25 +25019,25 @@ GL_PREFIX(ResumeTransformFeedback):
 GL_PREFIX(ClearDepthf):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearDepthf), .-GL_PREFIX(ClearDepthf)
@@ -24966,7 +25048,7 @@ GL_PREFIX(ClearDepthf):
 GL_PREFIX(DepthRangef):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24976,13 +25058,13 @@ GL_PREFIX(DepthRangef):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24992,7 +25074,7 @@ GL_PREFIX(DepthRangef):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DepthRangef), .-GL_PREFIX(DepthRangef)
@@ -25003,7 +25085,7 @@ GL_PREFIX(DepthRangef):
 GL_PREFIX(GetShaderPrecisionFormat):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25017,13 +25099,13 @@ GL_PREFIX(GetShaderPrecisionFormat):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25037,7 +25119,7 @@ GL_PREFIX(GetShaderPrecisionFormat):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetShaderPrecisionFormat), .-GL_PREFIX(GetShaderPrecisionFormat)
@@ -25048,25 +25130,25 @@ GL_PREFIX(GetShaderPrecisionFormat):
 GL_PREFIX(ReleaseShaderCompiler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5304(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ReleaseShaderCompiler), .-GL_PREFIX(ReleaseShaderCompiler)
@@ -25077,7 +25159,7 @@ GL_PREFIX(ReleaseShaderCompiler):
 GL_PREFIX(ShaderBinary):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25091,13 +25173,13 @@ GL_PREFIX(ShaderBinary):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25111,7 +25193,7 @@ GL_PREFIX(ShaderBinary):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ShaderBinary), .-GL_PREFIX(ShaderBinary)
@@ -25122,7 +25204,7 @@ GL_PREFIX(ShaderBinary):
 GL_PREFIX(DebugMessageCallbackARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25132,13 +25214,13 @@ GL_PREFIX(DebugMessageCallbackARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25148,7 +25230,7 @@ GL_PREFIX(DebugMessageCallbackARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DebugMessageCallbackARB), .-GL_PREFIX(DebugMessageCallbackARB)
@@ -25159,7 +25241,7 @@ GL_PREFIX(DebugMessageCallbackARB):
 GL_PREFIX(DebugMessageControlARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25177,13 +25259,13 @@ GL_PREFIX(DebugMessageControlARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25201,7 +25283,7 @@ GL_PREFIX(DebugMessageControlARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DebugMessageControlARB), .-GL_PREFIX(DebugMessageControlARB)
@@ -25212,7 +25294,7 @@ GL_PREFIX(DebugMessageControlARB):
 GL_PREFIX(DebugMessageInsertARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25230,13 +25312,13 @@ GL_PREFIX(DebugMessageInsertARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25254,7 +25336,7 @@ GL_PREFIX(DebugMessageInsertARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DebugMessageInsertARB), .-GL_PREFIX(DebugMessageInsertARB)
@@ -25265,7 +25347,7 @@ GL_PREFIX(DebugMessageInsertARB):
 GL_PREFIX(GetDebugMessageLogARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25283,13 +25365,13 @@ GL_PREFIX(GetDebugMessageLogARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25307,7 +25389,7 @@ GL_PREFIX(GetDebugMessageLogARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetDebugMessageLogARB), .-GL_PREFIX(GetDebugMessageLogARB)
@@ -25318,25 +25400,25 @@ GL_PREFIX(GetDebugMessageLogARB):
 GL_PREFIX(GetGraphicsResetStatusARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5352(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetGraphicsResetStatusARB), .-GL_PREFIX(GetGraphicsResetStatusARB)
@@ -25347,7 +25429,7 @@ GL_PREFIX(GetGraphicsResetStatusARB):
 GL_PREFIX(GetnColorTableARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25361,13 +25443,13 @@ GL_PREFIX(GetnColorTableARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25381,7 +25463,7 @@ GL_PREFIX(GetnColorTableARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnColorTableARB), .-GL_PREFIX(GetnColorTableARB)
@@ -25392,7 +25474,7 @@ GL_PREFIX(GetnColorTableARB):
 GL_PREFIX(GetnCompressedTexImageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25406,13 +25488,13 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25426,7 +25508,7 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnCompressedTexImageARB), .-GL_PREFIX(GetnCompressedTexImageARB)
@@ -25437,7 +25519,7 @@ GL_PREFIX(GetnCompressedTexImageARB):
 GL_PREFIX(GetnConvolutionFilterARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25451,13 +25533,13 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25471,7 +25553,7 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnConvolutionFilterARB), .-GL_PREFIX(GetnConvolutionFilterARB)
@@ -25482,7 +25564,7 @@ GL_PREFIX(GetnConvolutionFilterARB):
 GL_PREFIX(GetnHistogramARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25500,13 +25582,13 @@ GL_PREFIX(GetnHistogramARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25524,7 +25606,7 @@ GL_PREFIX(GetnHistogramARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnHistogramARB), .-GL_PREFIX(GetnHistogramARB)
@@ -25535,7 +25617,7 @@ GL_PREFIX(GetnHistogramARB):
 GL_PREFIX(GetnMapdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25549,13 +25631,13 @@ GL_PREFIX(GetnMapdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25569,7 +25651,7 @@ GL_PREFIX(GetnMapdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapdvARB), .-GL_PREFIX(GetnMapdvARB)
@@ -25580,7 +25662,7 @@ GL_PREFIX(GetnMapdvARB):
 GL_PREFIX(GetnMapfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25594,13 +25676,13 @@ GL_PREFIX(GetnMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25614,7 +25696,7 @@ GL_PREFIX(GetnMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapfvARB), .-GL_PREFIX(GetnMapfvARB)
@@ -25625,7 +25707,7 @@ GL_PREFIX(GetnMapfvARB):
 GL_PREFIX(GetnMapivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25639,13 +25721,13 @@ GL_PREFIX(GetnMapivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25659,7 +25741,7 @@ GL_PREFIX(GetnMapivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapivARB), .-GL_PREFIX(GetnMapivARB)
@@ -25670,7 +25752,7 @@ GL_PREFIX(GetnMapivARB):
 GL_PREFIX(GetnMinmaxARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25688,13 +25770,13 @@ GL_PREFIX(GetnMinmaxARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25712,7 +25794,7 @@ GL_PREFIX(GetnMinmaxARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMinmaxARB), .-GL_PREFIX(GetnMinmaxARB)
@@ -25723,7 +25805,7 @@ GL_PREFIX(GetnMinmaxARB):
 GL_PREFIX(GetnPixelMapfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25733,13 +25815,13 @@ GL_PREFIX(GetnPixelMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25749,7 +25831,7 @@ GL_PREFIX(GetnPixelMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapfvARB), .-GL_PREFIX(GetnPixelMapfvARB)
@@ -25760,7 +25842,7 @@ GL_PREFIX(GetnPixelMapfvARB):
 GL_PREFIX(GetnPixelMapuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25770,13 +25852,13 @@ GL_PREFIX(GetnPixelMapuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25786,7 +25868,7 @@ GL_PREFIX(GetnPixelMapuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapuivARB), .-GL_PREFIX(GetnPixelMapuivARB)
@@ -25797,7 +25879,7 @@ GL_PREFIX(GetnPixelMapuivARB):
 GL_PREFIX(GetnPixelMapusvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25807,13 +25889,13 @@ GL_PREFIX(GetnPixelMapusvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25823,7 +25905,7 @@ GL_PREFIX(GetnPixelMapusvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapusvARB), .-GL_PREFIX(GetnPixelMapusvARB)
@@ -25834,7 +25916,7 @@ GL_PREFIX(GetnPixelMapusvARB):
 GL_PREFIX(GetnPolygonStippleARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25844,13 +25926,13 @@ GL_PREFIX(GetnPolygonStippleARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25860,7 +25942,7 @@ GL_PREFIX(GetnPolygonStippleARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPolygonStippleARB), .-GL_PREFIX(GetnPolygonStippleARB)
@@ -25871,7 +25953,7 @@ GL_PREFIX(GetnPolygonStippleARB):
 GL_PREFIX(GetnSeparableFilterARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25889,13 +25971,13 @@ GL_PREFIX(GetnSeparableFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25913,7 +25995,7 @@ GL_PREFIX(GetnSeparableFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnSeparableFilterARB), .-GL_PREFIX(GetnSeparableFilterARB)
@@ -25924,7 +26006,7 @@ GL_PREFIX(GetnSeparableFilterARB):
 GL_PREFIX(GetnTexImageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25942,13 +26024,13 @@ GL_PREFIX(GetnTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25966,7 +26048,7 @@ GL_PREFIX(GetnTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnTexImageARB), .-GL_PREFIX(GetnTexImageARB)
@@ -25977,7 +26059,7 @@ GL_PREFIX(GetnTexImageARB):
 GL_PREFIX(GetnUniformdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25991,13 +26073,13 @@ GL_PREFIX(GetnUniformdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26011,7 +26093,7 @@ GL_PREFIX(GetnUniformdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformdvARB), .-GL_PREFIX(GetnUniformdvARB)
@@ -26022,7 +26104,7 @@ GL_PREFIX(GetnUniformdvARB):
 GL_PREFIX(GetnUniformfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26036,13 +26118,13 @@ GL_PREFIX(GetnUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26056,7 +26138,7 @@ GL_PREFIX(GetnUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformfvARB), .-GL_PREFIX(GetnUniformfvARB)
@@ -26067,7 +26149,7 @@ GL_PREFIX(GetnUniformfvARB):
 GL_PREFIX(GetnUniformivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26081,13 +26163,13 @@ GL_PREFIX(GetnUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26101,7 +26183,7 @@ GL_PREFIX(GetnUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformivARB), .-GL_PREFIX(GetnUniformivARB)
@@ -26112,7 +26194,7 @@ GL_PREFIX(GetnUniformivARB):
 GL_PREFIX(GetnUniformuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26126,13 +26208,13 @@ GL_PREFIX(GetnUniformuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26146,7 +26228,7 @@ GL_PREFIX(GetnUniformuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformuivARB), .-GL_PREFIX(GetnUniformuivARB)
@@ -26157,7 +26239,7 @@ GL_PREFIX(GetnUniformuivARB):
 GL_PREFIX(ReadnPixelsARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26175,13 +26257,13 @@ GL_PREFIX(ReadnPixelsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26199,7 +26281,7 @@ GL_PREFIX(ReadnPixelsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ReadnPixelsARB), .-GL_PREFIX(ReadnPixelsARB)
@@ -26210,7 +26292,7 @@ GL_PREFIX(ReadnPixelsARB):
 GL_PREFIX(TexStorage1D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26224,13 +26306,13 @@ GL_PREFIX(TexStorage1D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26244,7 +26326,7 @@ GL_PREFIX(TexStorage1D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage1D), .-GL_PREFIX(TexStorage1D)
@@ -26255,7 +26337,7 @@ GL_PREFIX(TexStorage1D):
 GL_PREFIX(TexStorage2D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26269,13 +26351,13 @@ GL_PREFIX(TexStorage2D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26289,7 +26371,7 @@ GL_PREFIX(TexStorage2D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage2D), .-GL_PREFIX(TexStorage2D)
@@ -26300,7 +26382,7 @@ GL_PREFIX(TexStorage2D):
 GL_PREFIX(TexStorage3D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26318,13 +26400,13 @@ GL_PREFIX(TexStorage3D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26342,7 +26424,7 @@ GL_PREFIX(TexStorage3D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage3D), .-GL_PREFIX(TexStorage3D)
@@ -26353,7 +26435,7 @@ GL_PREFIX(TexStorage3D):
 GL_PREFIX(TextureStorage1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26367,13 +26449,13 @@ GL_PREFIX(TextureStorage1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26387,7 +26469,7 @@ GL_PREFIX(TextureStorage1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage1DEXT), .-GL_PREFIX(TextureStorage1DEXT)
@@ -26398,7 +26480,7 @@ GL_PREFIX(TextureStorage1DEXT):
 GL_PREFIX(TextureStorage2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26416,13 +26498,13 @@ GL_PREFIX(TextureStorage2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26440,7 +26522,7 @@ GL_PREFIX(TextureStorage2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage2DEXT), .-GL_PREFIX(TextureStorage2DEXT)
@@ -26451,7 +26533,7 @@ GL_PREFIX(TextureStorage2DEXT):
 GL_PREFIX(TextureStorage3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26469,13 +26551,13 @@ GL_PREFIX(TextureStorage3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26493,7 +26575,7 @@ GL_PREFIX(TextureStorage3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage3DEXT), .-GL_PREFIX(TextureStorage3DEXT)
@@ -26504,7 +26586,7 @@ GL_PREFIX(TextureStorage3DEXT):
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -26514,13 +26596,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26530,19 +26612,19 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5560(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_696)
-	.type	GL_PREFIX(_dispatch_stub_696), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_696))
-GL_PREFIX(_dispatch_stub_696):
+	.globl	GL_PREFIX(_dispatch_stub_698)
+	.type	GL_PREFIX(_dispatch_stub_698), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_698))
+GL_PREFIX(_dispatch_stub_698):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26552,13 +26634,13 @@ GL_PREFIX(_dispatch_stub_696):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26568,19 +26650,19 @@ GL_PREFIX(_dispatch_stub_696):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_696), .-GL_PREFIX(_dispatch_stub_696)
+	.size	GL_PREFIX(_dispatch_stub_698), .-GL_PREFIX(_dispatch_stub_698)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_697)
-	.type	GL_PREFIX(_dispatch_stub_697), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_697))
-GL_PREFIX(_dispatch_stub_697):
+	.globl	GL_PREFIX(_dispatch_stub_699)
+	.type	GL_PREFIX(_dispatch_stub_699), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_699))
+GL_PREFIX(_dispatch_stub_699):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26590,13 +26672,13 @@ GL_PREFIX(_dispatch_stub_697):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26606,19 +26688,19 @@ GL_PREFIX(_dispatch_stub_697):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_697), .-GL_PREFIX(_dispatch_stub_697)
+	.size	GL_PREFIX(_dispatch_stub_699), .-GL_PREFIX(_dispatch_stub_699)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_698)
-	.type	GL_PREFIX(_dispatch_stub_698), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_698))
-GL_PREFIX(_dispatch_stub_698):
+	.globl	GL_PREFIX(_dispatch_stub_700)
+	.type	GL_PREFIX(_dispatch_stub_700), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_700))
+GL_PREFIX(_dispatch_stub_700):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -26628,13 +26710,13 @@ GL_PREFIX(_dispatch_stub_698):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26644,19 +26726,19 @@ GL_PREFIX(_dispatch_stub_698):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5584(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_698), .-GL_PREFIX(_dispatch_stub_698)
+	.size	GL_PREFIX(_dispatch_stub_700), .-GL_PREFIX(_dispatch_stub_700)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_699)
-	.type	GL_PREFIX(_dispatch_stub_699), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_699))
-GL_PREFIX(_dispatch_stub_699):
+	.globl	GL_PREFIX(_dispatch_stub_701)
+	.type	GL_PREFIX(_dispatch_stub_701), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_701))
+GL_PREFIX(_dispatch_stub_701):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26666,13 +26748,13 @@ GL_PREFIX(_dispatch_stub_699):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26682,19 +26764,19 @@ GL_PREFIX(_dispatch_stub_699):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_699), .-GL_PREFIX(_dispatch_stub_699)
+	.size	GL_PREFIX(_dispatch_stub_701), .-GL_PREFIX(_dispatch_stub_701)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_700)
-	.type	GL_PREFIX(_dispatch_stub_700), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_700))
-GL_PREFIX(_dispatch_stub_700):
+	.globl	GL_PREFIX(_dispatch_stub_702)
+	.type	GL_PREFIX(_dispatch_stub_702), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_702))
+GL_PREFIX(_dispatch_stub_702):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26704,13 +26786,13 @@ GL_PREFIX(_dispatch_stub_700):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26720,19 +26802,19 @@ GL_PREFIX(_dispatch_stub_700):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_700), .-GL_PREFIX(_dispatch_stub_700)
+	.size	GL_PREFIX(_dispatch_stub_702), .-GL_PREFIX(_dispatch_stub_702)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_701)
-	.type	GL_PREFIX(_dispatch_stub_701), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_701))
-GL_PREFIX(_dispatch_stub_701):
+	.globl	GL_PREFIX(_dispatch_stub_703)
+	.type	GL_PREFIX(_dispatch_stub_703), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_703))
+GL_PREFIX(_dispatch_stub_703):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26742,13 +26824,13 @@ GL_PREFIX(_dispatch_stub_701):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26758,19 +26840,19 @@ GL_PREFIX(_dispatch_stub_701):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_701), .-GL_PREFIX(_dispatch_stub_701)
+	.size	GL_PREFIX(_dispatch_stub_703), .-GL_PREFIX(_dispatch_stub_703)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_702)
-	.type	GL_PREFIX(_dispatch_stub_702), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_702))
-GL_PREFIX(_dispatch_stub_702):
+	.globl	GL_PREFIX(_dispatch_stub_704)
+	.type	GL_PREFIX(_dispatch_stub_704), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_704))
+GL_PREFIX(_dispatch_stub_704):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26780,13 +26862,13 @@ GL_PREFIX(_dispatch_stub_702):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26796,40 +26878,40 @@ GL_PREFIX(_dispatch_stub_702):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_702), .-GL_PREFIX(_dispatch_stub_702)
+	.size	GL_PREFIX(_dispatch_stub_704), .-GL_PREFIX(_dispatch_stub_704)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_703)
-	.type	GL_PREFIX(_dispatch_stub_703), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_703))
-GL_PREFIX(_dispatch_stub_703):
+	.globl	GL_PREFIX(_dispatch_stub_705)
+	.type	GL_PREFIX(_dispatch_stub_705), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_705))
+GL_PREFIX(_dispatch_stub_705):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_703), .-GL_PREFIX(_dispatch_stub_703)
+	.size	GL_PREFIX(_dispatch_stub_705), .-GL_PREFIX(_dispatch_stub_705)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
@@ -26837,7 +26919,7 @@ GL_PREFIX(_dispatch_stub_703):
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26851,13 +26933,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26871,7 +26953,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -26882,7 +26964,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26892,13 +26974,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26908,7 +26990,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -26919,7 +27001,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26933,13 +27015,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26953,7 +27035,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -26964,7 +27046,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26978,13 +27060,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26998,7 +27080,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -27009,7 +27091,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27023,13 +27105,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27043,7 +27125,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -27054,7 +27136,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27068,13 +27150,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27088,7 +27170,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -27099,7 +27181,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27109,13 +27191,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27125,7 +27207,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5680(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -27136,7 +27218,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27146,13 +27228,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27162,7 +27244,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -27173,7 +27255,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27183,13 +27265,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27199,7 +27281,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -27210,25 +27292,25 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5704(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
@@ -27239,7 +27321,7 @@ GL_PREFIX(UnlockArraysEXT):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27249,13 +27331,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27265,7 +27347,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -27276,25 +27358,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -27305,7 +27387,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27317,13 +27399,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27335,7 +27417,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5728(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -27346,25 +27428,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -27375,7 +27457,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27387,13 +27469,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27405,7 +27487,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5744(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -27416,25 +27498,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -27445,7 +27527,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27455,13 +27537,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27471,7 +27553,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -27482,25 +27564,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -27511,7 +27593,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27521,13 +27603,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27537,7 +27619,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -27548,25 +27630,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -27577,7 +27659,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27587,13 +27669,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27603,7 +27685,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -27614,25 +27696,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -27643,7 +27725,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27653,13 +27735,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27669,7 +27751,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -27680,25 +27762,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -27709,7 +27791,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27719,13 +27801,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27735,7 +27817,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -27746,25 +27828,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -27775,7 +27857,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27789,13 +27871,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27809,7 +27891,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -27820,7 +27902,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27834,13 +27916,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27854,7 +27936,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -27865,7 +27947,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27879,13 +27961,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27899,7 +27981,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -27910,7 +27992,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27920,13 +28002,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27936,7 +28018,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -27947,7 +28029,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -27955,13 +28037,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -27969,7 +28051,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5872(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -27980,25 +28062,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -28009,7 +28091,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -28017,13 +28099,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -28031,7 +28113,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5888(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -28042,58 +28124,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_738)
-	.type	GL_PREFIX(_dispatch_stub_738), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_738))
-GL_PREFIX(_dispatch_stub_738):
+	.globl	GL_PREFIX(_dispatch_stub_740)
+	.type	GL_PREFIX(_dispatch_stub_740), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_740))
+GL_PREFIX(_dispatch_stub_740):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_738), .-GL_PREFIX(_dispatch_stub_738)
+	.size	GL_PREFIX(_dispatch_stub_740), .-GL_PREFIX(_dispatch_stub_740)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -28101,7 +28183,7 @@ GL_PREFIX(_dispatch_stub_738):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28115,13 +28197,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28135,7 +28217,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -28146,25 +28228,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5920(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -28175,7 +28257,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28185,13 +28267,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28201,7 +28283,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -28212,7 +28294,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28230,13 +28312,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28254,7 +28336,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -28265,7 +28347,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28283,13 +28365,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28307,7 +28389,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -28318,7 +28400,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28328,13 +28410,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28344,7 +28426,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5952(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -28355,7 +28437,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28365,13 +28447,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28381,7 +28463,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -28392,7 +28474,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28402,13 +28484,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28418,7 +28500,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -28429,7 +28511,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28439,13 +28521,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28455,7 +28537,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -28466,7 +28548,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28480,13 +28562,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28500,7 +28582,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -28511,7 +28593,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28525,13 +28607,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28545,7 +28627,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -28556,7 +28638,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28570,13 +28652,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28590,7 +28672,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -28601,7 +28683,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28615,13 +28697,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28635,7 +28717,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -28646,7 +28728,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28660,13 +28742,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28680,7 +28762,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -28691,7 +28773,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28701,13 +28783,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28717,7 +28799,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -28728,7 +28810,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28738,13 +28820,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28754,7 +28836,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -28765,25 +28847,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6040(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -28794,7 +28876,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28804,13 +28886,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28820,7 +28902,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6048(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -28831,25 +28913,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -28860,7 +28942,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28870,13 +28952,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28886,7 +28968,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6064(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -28897,25 +28979,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -28926,7 +29008,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28936,13 +29018,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28952,7 +29034,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -28963,25 +29045,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -28992,7 +29074,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29002,13 +29084,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29018,7 +29100,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -29029,25 +29111,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -29058,7 +29140,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -29070,13 +29152,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -29088,7 +29170,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6112(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -29099,25 +29181,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -29128,7 +29210,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -29140,13 +29222,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -29158,7 +29240,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6128(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -29169,25 +29251,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -29198,7 +29280,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29208,13 +29290,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29224,7 +29306,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -29235,25 +29317,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -29264,7 +29346,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29274,13 +29356,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29290,7 +29372,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -29301,25 +29383,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -29330,7 +29412,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -29344,13 +29426,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -29364,7 +29446,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6176(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -29375,25 +29457,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -29404,7 +29486,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -29418,13 +29500,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -29438,7 +29520,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -29449,25 +29531,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -29478,7 +29560,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29492,13 +29574,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29512,7 +29594,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -29523,25 +29605,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -29552,7 +29634,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29566,13 +29648,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29586,7 +29668,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -29597,37 +29679,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_780)
-	.type	GL_PREFIX(_dispatch_stub_780), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_780))
-GL_PREFIX(_dispatch_stub_780):
+	.globl	GL_PREFIX(_dispatch_stub_782)
+	.type	GL_PREFIX(_dispatch_stub_782), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_782))
+GL_PREFIX(_dispatch_stub_782):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29641,13 +29723,13 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29661,19 +29743,19 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
+	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_781)
-	.type	GL_PREFIX(_dispatch_stub_781), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_781))
-GL_PREFIX(_dispatch_stub_781):
+	.globl	GL_PREFIX(_dispatch_stub_783)
+	.type	GL_PREFIX(_dispatch_stub_783), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_783))
+GL_PREFIX(_dispatch_stub_783):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29691,13 +29773,13 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29715,19 +29797,19 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
+	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_782)
-	.type	GL_PREFIX(_dispatch_stub_782), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_782))
-GL_PREFIX(_dispatch_stub_782):
+	.globl	GL_PREFIX(_dispatch_stub_784)
+	.type	GL_PREFIX(_dispatch_stub_784), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_784))
+GL_PREFIX(_dispatch_stub_784):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29737,13 +29819,13 @@ GL_PREFIX(_dispatch_stub_782):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29753,49 +29835,49 @@ GL_PREFIX(_dispatch_stub_782):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
+	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_783)
-	.type	GL_PREFIX(_dispatch_stub_783), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_783))
-GL_PREFIX(_dispatch_stub_783):
+	.globl	GL_PREFIX(_dispatch_stub_785)
+	.type	GL_PREFIX(_dispatch_stub_785), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_785))
+GL_PREFIX(_dispatch_stub_785):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
+	.size	GL_PREFIX(_dispatch_stub_785), .-GL_PREFIX(_dispatch_stub_785)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_784)
-	.type	GL_PREFIX(_dispatch_stub_784), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_784))
-GL_PREFIX(_dispatch_stub_784):
+	.globl	GL_PREFIX(_dispatch_stub_786)
+	.type	GL_PREFIX(_dispatch_stub_786), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_786))
+GL_PREFIX(_dispatch_stub_786):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29805,13 +29887,13 @@ GL_PREFIX(_dispatch_stub_784):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29821,19 +29903,19 @@ GL_PREFIX(_dispatch_stub_784):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
+	.size	GL_PREFIX(_dispatch_stub_786), .-GL_PREFIX(_dispatch_stub_786)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_785)
-	.type	GL_PREFIX(_dispatch_stub_785), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_785))
-GL_PREFIX(_dispatch_stub_785):
+	.globl	GL_PREFIX(_dispatch_stub_787)
+	.type	GL_PREFIX(_dispatch_stub_787), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_787))
+GL_PREFIX(_dispatch_stub_787):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29843,13 +29925,13 @@ GL_PREFIX(_dispatch_stub_785):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29859,49 +29941,49 @@ GL_PREFIX(_dispatch_stub_785):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_785), .-GL_PREFIX(_dispatch_stub_785)
+	.size	GL_PREFIX(_dispatch_stub_787), .-GL_PREFIX(_dispatch_stub_787)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_786)
-	.type	GL_PREFIX(_dispatch_stub_786), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_786))
-GL_PREFIX(_dispatch_stub_786):
+	.globl	GL_PREFIX(_dispatch_stub_788)
+	.type	GL_PREFIX(_dispatch_stub_788), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_788))
+GL_PREFIX(_dispatch_stub_788):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_786), .-GL_PREFIX(_dispatch_stub_786)
+	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_787)
-	.type	GL_PREFIX(_dispatch_stub_787), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_787))
-GL_PREFIX(_dispatch_stub_787):
+	.globl	GL_PREFIX(_dispatch_stub_789)
+	.type	GL_PREFIX(_dispatch_stub_789), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_789))
+GL_PREFIX(_dispatch_stub_789):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29911,13 +29993,13 @@ GL_PREFIX(_dispatch_stub_787):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29927,40 +30009,40 @@ GL_PREFIX(_dispatch_stub_787):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_787), .-GL_PREFIX(_dispatch_stub_787)
+	.size	GL_PREFIX(_dispatch_stub_789), .-GL_PREFIX(_dispatch_stub_789)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_788)
-	.type	GL_PREFIX(_dispatch_stub_788), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_788))
-GL_PREFIX(_dispatch_stub_788):
+	.globl	GL_PREFIX(_dispatch_stub_790)
+	.type	GL_PREFIX(_dispatch_stub_790), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_790))
+GL_PREFIX(_dispatch_stub_790):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
+	.size	GL_PREFIX(_dispatch_stub_790), .-GL_PREFIX(_dispatch_stub_790)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -29968,7 +30050,7 @@ GL_PREFIX(_dispatch_stub_788):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29978,13 +30060,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29994,7 +30076,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -30005,7 +30087,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30015,13 +30097,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30031,7 +30113,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -30042,7 +30124,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30052,13 +30134,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30068,7 +30150,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -30079,7 +30161,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30089,13 +30171,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30105,7 +30187,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -30116,7 +30198,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30126,13 +30208,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30142,7 +30224,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -30153,7 +30235,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30167,13 +30249,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30187,7 +30269,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -30198,7 +30280,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30212,13 +30294,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30232,7 +30314,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -30243,7 +30325,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30253,13 +30335,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30269,7 +30351,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -30280,7 +30362,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30290,13 +30372,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30306,7 +30388,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -30317,7 +30399,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30331,13 +30413,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30351,7 +30433,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -30362,7 +30444,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30372,13 +30454,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30388,7 +30470,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -30399,7 +30481,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30409,13 +30491,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30425,7 +30507,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -30436,7 +30518,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30446,13 +30528,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30462,7 +30544,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -30473,7 +30555,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30483,13 +30565,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30499,7 +30581,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -30510,25 +30592,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -30539,7 +30621,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30553,13 +30635,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30573,7 +30655,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -30584,7 +30666,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30598,13 +30680,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30618,7 +30700,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -30629,7 +30711,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30643,13 +30725,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30663,7 +30745,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -30674,7 +30756,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30684,13 +30766,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30700,7 +30782,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -30711,7 +30793,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30725,13 +30807,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30745,7 +30827,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -30756,7 +30838,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30766,13 +30848,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30782,7 +30864,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -30793,7 +30875,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30803,13 +30885,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30819,7 +30901,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -30830,7 +30912,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30840,13 +30922,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30856,7 +30938,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -30867,7 +30949,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30877,13 +30959,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30893,7 +30975,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -30904,7 +30986,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30914,13 +30996,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30930,7 +31012,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -30941,7 +31023,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30951,13 +31033,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30967,7 +31049,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -30978,7 +31060,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30990,13 +31072,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -31008,7 +31090,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -31019,7 +31101,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31029,13 +31111,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31045,7 +31127,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -31056,7 +31138,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -31068,13 +31150,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -31086,7 +31168,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -31097,7 +31179,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31107,13 +31189,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31123,7 +31205,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -31134,7 +31216,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31144,13 +31226,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31160,7 +31242,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -31171,7 +31253,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31181,13 +31263,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31197,7 +31279,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -31208,7 +31290,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31222,13 +31304,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31242,7 +31324,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -31253,7 +31335,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31263,13 +31345,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31279,7 +31361,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -31290,7 +31372,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31304,13 +31386,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31324,7 +31406,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -31335,7 +31417,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31345,13 +31427,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31361,7 +31443,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -31372,7 +31454,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6600(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31386,13 +31468,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6600(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6600(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31406,7 +31488,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6600(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -31417,7 +31499,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6608(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31427,13 +31509,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6608(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31443,7 +31525,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -31454,7 +31536,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6616(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31470,13 +31552,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6616(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6616(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31492,7 +31574,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6616(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -31503,7 +31585,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6624(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31513,13 +31595,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6624(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31529,7 +31611,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -31540,7 +31622,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6632(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31556,13 +31638,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6632(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6632(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31578,7 +31660,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6632(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -31589,7 +31671,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6640(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31599,13 +31681,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6640(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31615,7 +31697,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -31626,7 +31708,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6648(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31640,13 +31722,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6648(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6648(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31660,7 +31742,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6648(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -31671,7 +31753,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6656(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31681,13 +31763,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6656(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31697,7 +31779,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -31708,7 +31790,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6664(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31722,13 +31804,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6664(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31742,7 +31824,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -31753,7 +31835,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6672(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31763,13 +31845,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6672(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31779,7 +31861,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -31790,7 +31872,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6680(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31804,13 +31886,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6680(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31824,7 +31906,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -31835,7 +31917,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6688(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31845,13 +31927,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6688(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31861,7 +31943,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -31872,7 +31954,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6696(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31882,13 +31964,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6696(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31898,7 +31980,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -31909,7 +31991,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6704(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31919,13 +32001,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6704(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31935,7 +32017,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -31946,7 +32028,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6712(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31956,13 +32038,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6712(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31972,7 +32054,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -31983,7 +32065,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6720(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31993,13 +32075,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6720(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32009,7 +32091,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -32020,7 +32102,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6728(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32030,13 +32112,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6728(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32046,7 +32128,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -32057,7 +32139,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6736(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32067,13 +32149,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6736(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32083,7 +32165,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -32094,7 +32176,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6744(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32104,13 +32186,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6744(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32120,7 +32202,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -32131,7 +32213,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6752(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32141,13 +32223,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6752(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32157,7 +32239,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -32168,7 +32250,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6760(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32178,13 +32260,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6760(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32194,7 +32276,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -32205,7 +32287,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6768(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32215,13 +32297,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6768(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32231,7 +32313,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -32242,7 +32324,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6776(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32252,13 +32334,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6776(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32268,7 +32350,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -32279,7 +32361,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6784(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32289,13 +32371,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6784(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32305,7 +32387,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -32316,7 +32398,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6792(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32326,13 +32408,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6792(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32342,7 +32424,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -32353,7 +32435,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6800(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32363,13 +32445,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6800(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32379,7 +32461,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -32390,7 +32472,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6808(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32400,13 +32482,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6808(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32416,7 +32498,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -32427,7 +32509,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6816(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32437,13 +32519,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6816(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6816(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32453,7 +32535,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6816(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -32464,7 +32546,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6824(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32482,13 +32564,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6824(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32506,7 +32588,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -32517,7 +32599,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6832(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32535,13 +32617,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6832(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32559,7 +32641,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -32570,7 +32652,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6840(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32588,13 +32670,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6840(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32612,7 +32694,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -32623,25 +32705,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6848(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6848(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6848(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6848(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -32652,25 +32734,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6856(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6856(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -32681,7 +32763,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6864(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32699,13 +32781,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6864(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6864(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32723,7 +32805,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6864(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -32734,7 +32816,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6872(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32752,13 +32834,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6872(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32776,7 +32858,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -32787,7 +32869,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6880(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32805,13 +32887,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6880(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32829,7 +32911,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -32840,25 +32922,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6888(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6888(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -32869,25 +32951,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6896(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6896(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6896(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6896(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -32898,25 +32980,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6904(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6904(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -32927,7 +33009,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6912(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32937,13 +33019,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6912(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6912(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32953,7 +33035,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6912(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -32964,7 +33046,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6920(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32974,13 +33056,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6920(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32990,7 +33072,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -33001,7 +33083,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6928(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33011,13 +33093,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6928(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33027,7 +33109,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -33038,7 +33120,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6936(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33048,13 +33130,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6936(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33064,7 +33146,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -33075,7 +33157,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6944(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33085,13 +33167,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6944(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33101,79 +33183,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_869)
-	.type	GL_PREFIX(_dispatch_stub_869), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_869))
-GL_PREFIX(_dispatch_stub_869):
+	.globl	GL_PREFIX(_dispatch_stub_871)
+	.type	GL_PREFIX(_dispatch_stub_871), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_871))
+GL_PREFIX(_dispatch_stub_871):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6952(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6952(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6952(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6952(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_869), .-GL_PREFIX(_dispatch_stub_869)
+	.size	GL_PREFIX(_dispatch_stub_871), .-GL_PREFIX(_dispatch_stub_871)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_870)
-	.type	GL_PREFIX(_dispatch_stub_870), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_870))
-GL_PREFIX(_dispatch_stub_870):
+	.globl	GL_PREFIX(_dispatch_stub_872)
+	.type	GL_PREFIX(_dispatch_stub_872), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_872))
+GL_PREFIX(_dispatch_stub_872):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6960(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6960(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_870), .-GL_PREFIX(_dispatch_stub_870)
+	.size	GL_PREFIX(_dispatch_stub_872), .-GL_PREFIX(_dispatch_stub_872)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_871)
-	.type	GL_PREFIX(_dispatch_stub_871), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_871))
-GL_PREFIX(_dispatch_stub_871):
+	.globl	GL_PREFIX(_dispatch_stub_873)
+	.type	GL_PREFIX(_dispatch_stub_873), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_873))
+GL_PREFIX(_dispatch_stub_873):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6968(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33183,13 +33265,13 @@ GL_PREFIX(_dispatch_stub_871):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6968(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6968(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33199,19 +33281,19 @@ GL_PREFIX(_dispatch_stub_871):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6968(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_871), .-GL_PREFIX(_dispatch_stub_871)
+	.size	GL_PREFIX(_dispatch_stub_873), .-GL_PREFIX(_dispatch_stub_873)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_872)
-	.type	GL_PREFIX(_dispatch_stub_872), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_872))
-GL_PREFIX(_dispatch_stub_872):
+	.globl	GL_PREFIX(_dispatch_stub_874)
+	.type	GL_PREFIX(_dispatch_stub_874), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_874))
+GL_PREFIX(_dispatch_stub_874):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6976(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33221,13 +33303,13 @@ GL_PREFIX(_dispatch_stub_872):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6976(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6976(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33237,40 +33319,40 @@ GL_PREFIX(_dispatch_stub_872):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6976(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_872), .-GL_PREFIX(_dispatch_stub_872)
+	.size	GL_PREFIX(_dispatch_stub_874), .-GL_PREFIX(_dispatch_stub_874)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_873)
-	.type	GL_PREFIX(_dispatch_stub_873), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_873))
-GL_PREFIX(_dispatch_stub_873):
+	.globl	GL_PREFIX(_dispatch_stub_875)
+	.type	GL_PREFIX(_dispatch_stub_875), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_875))
+GL_PREFIX(_dispatch_stub_875):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6984(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6984(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6984(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6984(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_873), .-GL_PREFIX(_dispatch_stub_873)
+	.size	GL_PREFIX(_dispatch_stub_875), .-GL_PREFIX(_dispatch_stub_875)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -33278,7 +33360,7 @@ GL_PREFIX(_dispatch_stub_873):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6992(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33292,13 +33374,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6992(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6992(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33312,7 +33394,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6992(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -33323,7 +33405,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7000(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33337,13 +33419,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7000(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7000(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33357,7 +33439,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7000(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -33368,7 +33450,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7008(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -33388,13 +33470,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7008(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7008(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -33414,7 +33496,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7008(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -33425,7 +33507,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7016(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33439,13 +33521,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7016(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7016(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33459,7 +33541,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7016(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -33470,7 +33552,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7024(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -33490,13 +33572,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7024(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7024(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -33516,7 +33598,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7024(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -33527,7 +33609,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7032(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33541,13 +33623,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7032(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33561,7 +33643,7 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
@@ -33572,25 +33654,25 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 GL_PREFIX(PrimitiveRestartIndexNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7040(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7040(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7040(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7040(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartIndexNV), .-GL_PREFIX(PrimitiveRestartIndexNV)
@@ -33601,37 +33683,37 @@ GL_PREFIX(PrimitiveRestartIndexNV):
 GL_PREFIX(PrimitiveRestartNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7048(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7048(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7048(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7048(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartNV), .-GL_PREFIX(PrimitiveRestartNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_882)
-	.type	GL_PREFIX(_dispatch_stub_882), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_882))
-GL_PREFIX(_dispatch_stub_882):
+	.globl	GL_PREFIX(_dispatch_stub_884)
+	.type	GL_PREFIX(_dispatch_stub_884), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_884))
+GL_PREFIX(_dispatch_stub_884):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7056(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33641,13 +33723,13 @@ GL_PREFIX(_dispatch_stub_882):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7056(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33657,19 +33739,19 @@ GL_PREFIX(_dispatch_stub_882):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_882), .-GL_PREFIX(_dispatch_stub_882)
+	.size	GL_PREFIX(_dispatch_stub_884), .-GL_PREFIX(_dispatch_stub_884)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_883)
-	.type	GL_PREFIX(_dispatch_stub_883), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_883))
-GL_PREFIX(_dispatch_stub_883):
+	.globl	GL_PREFIX(_dispatch_stub_885)
+	.type	GL_PREFIX(_dispatch_stub_885), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_885))
+GL_PREFIX(_dispatch_stub_885):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7064(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33679,13 +33761,13 @@ GL_PREFIX(_dispatch_stub_883):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7064(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7064(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33695,10 +33777,10 @@ GL_PREFIX(_dispatch_stub_883):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7064(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_883), .-GL_PREFIX(_dispatch_stub_883)
+	.size	GL_PREFIX(_dispatch_stub_885), .-GL_PREFIX(_dispatch_stub_885)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -33706,7 +33788,7 @@ GL_PREFIX(_dispatch_stub_883):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7072(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33716,13 +33798,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7072(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33732,7 +33814,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -33743,7 +33825,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7080(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33753,13 +33835,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7080(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33769,7 +33851,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -33780,25 +33862,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7088(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7088(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7088(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7088(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -33809,7 +33891,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7096(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33819,13 +33901,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7096(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33835,7 +33917,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -33846,7 +33928,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7104(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33856,13 +33938,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7104(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33872,7 +33954,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -33883,7 +33965,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7112(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33897,13 +33979,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7112(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33917,7 +33999,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -33928,7 +34010,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7120(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33942,13 +34024,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7120(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33962,7 +34044,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -33973,7 +34055,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7128(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33987,13 +34069,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7128(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34007,7 +34089,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -34018,7 +34100,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7136(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34036,13 +34118,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7136(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34060,7 +34142,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -34071,7 +34153,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7144(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34081,13 +34163,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7144(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34097,7 +34179,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -34108,7 +34190,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7152(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34118,13 +34200,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7152(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7152(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34134,7 +34216,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7152(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -34145,25 +34227,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7160(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7160(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7160(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7160(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -34174,7 +34256,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7168(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34188,13 +34270,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7168(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7168(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34208,7 +34290,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7168(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -34219,7 +34301,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7176(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34229,13 +34311,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7176(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7176(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34245,7 +34327,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7176(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -34256,25 +34338,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7184(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7184(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7184(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7184(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -34285,25 +34367,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7192(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7192(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7192(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7192(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -34314,7 +34396,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7200(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34328,13 +34410,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7200(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7200(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34348,19 +34430,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7200(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_901)
-	.type	GL_PREFIX(_dispatch_stub_901), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_901))
-GL_PREFIX(_dispatch_stub_901):
+	.globl	GL_PREFIX(_dispatch_stub_903)
+	.type	GL_PREFIX(_dispatch_stub_903), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_903))
+GL_PREFIX(_dispatch_stub_903):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7208(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34378,13 +34460,13 @@ GL_PREFIX(_dispatch_stub_901):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7208(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7208(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34402,19 +34484,19 @@ GL_PREFIX(_dispatch_stub_901):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7208(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_901), .-GL_PREFIX(_dispatch_stub_901)
+	.size	GL_PREFIX(_dispatch_stub_903), .-GL_PREFIX(_dispatch_stub_903)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_902)
-	.type	GL_PREFIX(_dispatch_stub_902), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_902))
-GL_PREFIX(_dispatch_stub_902):
+	.globl	GL_PREFIX(_dispatch_stub_904)
+	.type	GL_PREFIX(_dispatch_stub_904), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_904))
+GL_PREFIX(_dispatch_stub_904):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7216(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34424,13 +34506,13 @@ GL_PREFIX(_dispatch_stub_902):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7216(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7216(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34440,19 +34522,19 @@ GL_PREFIX(_dispatch_stub_902):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7216(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_902), .-GL_PREFIX(_dispatch_stub_902)
+	.size	GL_PREFIX(_dispatch_stub_904), .-GL_PREFIX(_dispatch_stub_904)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_903)
-	.type	GL_PREFIX(_dispatch_stub_903), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_903))
-GL_PREFIX(_dispatch_stub_903):
+	.globl	GL_PREFIX(_dispatch_stub_905)
+	.type	GL_PREFIX(_dispatch_stub_905), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_905))
+GL_PREFIX(_dispatch_stub_905):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7224(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34462,13 +34544,13 @@ GL_PREFIX(_dispatch_stub_903):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7224(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7224(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34478,10 +34560,10 @@ GL_PREFIX(_dispatch_stub_903):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7224(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_903), .-GL_PREFIX(_dispatch_stub_903)
+	.size	GL_PREFIX(_dispatch_stub_905), .-GL_PREFIX(_dispatch_stub_905)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFragDataLocationEXT)
@@ -34489,7 +34571,7 @@ GL_PREFIX(_dispatch_stub_903):
 GL_PREFIX(BindFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7232(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34499,13 +34581,13 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7232(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7232(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34515,7 +34597,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7232(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragDataLocationEXT), .-GL_PREFIX(BindFragDataLocationEXT)
@@ -34526,7 +34608,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 GL_PREFIX(GetFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7240(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34536,13 +34618,13 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7240(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7240(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34552,7 +34634,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7240(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFragDataLocationEXT), .-GL_PREFIX(GetFragDataLocationEXT)
@@ -34563,7 +34645,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 GL_PREFIX(GetUniformuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7248(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34573,13 +34655,13 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7248(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7248(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34589,7 +34671,7 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7248(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformuivEXT), .-GL_PREFIX(GetUniformuivEXT)
@@ -34600,7 +34682,7 @@ GL_PREFIX(GetUniformuivEXT):
 GL_PREFIX(GetVertexAttribIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7256(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34610,13 +34692,13 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7256(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7256(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34626,7 +34708,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7256(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIivEXT), .-GL_PREFIX(GetVertexAttribIivEXT)
@@ -34637,7 +34719,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 GL_PREFIX(GetVertexAttribIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7264(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34647,13 +34729,13 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7264(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7264(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34663,7 +34745,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7264(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIuivEXT), .-GL_PREFIX(GetVertexAttribIuivEXT)
@@ -34674,7 +34756,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 GL_PREFIX(Uniform1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7272(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34684,13 +34766,13 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7272(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7272(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34700,7 +34782,7 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7272(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uiEXT), .-GL_PREFIX(Uniform1uiEXT)
@@ -34711,7 +34793,7 @@ GL_PREFIX(Uniform1uiEXT):
 GL_PREFIX(Uniform1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7280(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34721,13 +34803,13 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7280(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7280(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34737,7 +34819,7 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7280(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uivEXT), .-GL_PREFIX(Uniform1uivEXT)
@@ -34748,7 +34830,7 @@ GL_PREFIX(Uniform1uivEXT):
 GL_PREFIX(Uniform2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7288(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34758,13 +34840,13 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7288(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7288(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34774,7 +34856,7 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7288(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uiEXT), .-GL_PREFIX(Uniform2uiEXT)
@@ -34785,7 +34867,7 @@ GL_PREFIX(Uniform2uiEXT):
 GL_PREFIX(Uniform2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7296(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34795,13 +34877,13 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7296(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7296(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34811,7 +34893,7 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7296(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uivEXT), .-GL_PREFIX(Uniform2uivEXT)
@@ -34822,7 +34904,7 @@ GL_PREFIX(Uniform2uivEXT):
 GL_PREFIX(Uniform3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7304(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34836,13 +34918,13 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7304(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7304(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34856,7 +34938,7 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7304(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uiEXT), .-GL_PREFIX(Uniform3uiEXT)
@@ -34867,7 +34949,7 @@ GL_PREFIX(Uniform3uiEXT):
 GL_PREFIX(Uniform3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7312(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34877,13 +34959,13 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7312(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7312(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34893,7 +34975,7 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7312(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uivEXT), .-GL_PREFIX(Uniform3uivEXT)
@@ -34904,7 +34986,7 @@ GL_PREFIX(Uniform3uivEXT):
 GL_PREFIX(Uniform4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7320(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34918,13 +35000,13 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7320(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7320(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34938,7 +35020,7 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7320(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uiEXT), .-GL_PREFIX(Uniform4uiEXT)
@@ -34949,7 +35031,7 @@ GL_PREFIX(Uniform4uiEXT):
 GL_PREFIX(Uniform4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7328(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34959,13 +35041,13 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7328(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7328(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34975,7 +35057,7 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7328(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uivEXT), .-GL_PREFIX(Uniform4uivEXT)
@@ -34986,7 +35068,7 @@ GL_PREFIX(Uniform4uivEXT):
 GL_PREFIX(VertexAttribI1iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7336(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34996,13 +35078,13 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7336(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7336(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35012,7 +35094,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7336(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1iEXT), .-GL_PREFIX(VertexAttribI1iEXT)
@@ -35023,7 +35105,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 GL_PREFIX(VertexAttribI1ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7344(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35033,13 +35115,13 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7344(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7344(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35049,7 +35131,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7344(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1ivEXT), .-GL_PREFIX(VertexAttribI1ivEXT)
@@ -35060,7 +35142,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 GL_PREFIX(VertexAttribI1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7352(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35070,13 +35152,13 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7352(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7352(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35086,7 +35168,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7352(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uiEXT), .-GL_PREFIX(VertexAttribI1uiEXT)
@@ -35097,7 +35179,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 GL_PREFIX(VertexAttribI1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7360(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35107,13 +35189,13 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7360(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7360(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35123,7 +35205,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7360(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uivEXT), .-GL_PREFIX(VertexAttribI1uivEXT)
@@ -35134,7 +35216,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 GL_PREFIX(VertexAttribI2iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7368(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35144,13 +35226,13 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7368(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7368(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35160,7 +35242,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7368(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2iEXT), .-GL_PREFIX(VertexAttribI2iEXT)
@@ -35171,7 +35253,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 GL_PREFIX(VertexAttribI2ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7376(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35181,13 +35263,13 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7376(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7376(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35197,7 +35279,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7376(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2ivEXT), .-GL_PREFIX(VertexAttribI2ivEXT)
@@ -35208,7 +35290,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 GL_PREFIX(VertexAttribI2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7384(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35218,13 +35300,13 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7384(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7384(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35234,7 +35316,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7384(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uiEXT), .-GL_PREFIX(VertexAttribI2uiEXT)
@@ -35245,7 +35327,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 GL_PREFIX(VertexAttribI2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7392(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35255,13 +35337,13 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7392(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7392(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35271,7 +35353,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7392(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uivEXT), .-GL_PREFIX(VertexAttribI2uivEXT)
@@ -35282,7 +35364,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 GL_PREFIX(VertexAttribI3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7400(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35296,13 +35378,13 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7400(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7400(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35316,7 +35398,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7400(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3iEXT), .-GL_PREFIX(VertexAttribI3iEXT)
@@ -35327,7 +35409,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 GL_PREFIX(VertexAttribI3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7408(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35337,13 +35419,13 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7408(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7408(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35353,7 +35435,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7408(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3ivEXT), .-GL_PREFIX(VertexAttribI3ivEXT)
@@ -35364,7 +35446,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 GL_PREFIX(VertexAttribI3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7416(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35378,13 +35460,13 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7416(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7416(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35398,7 +35480,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7416(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uiEXT), .-GL_PREFIX(VertexAttribI3uiEXT)
@@ -35409,7 +35491,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 GL_PREFIX(VertexAttribI3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7424(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35419,13 +35501,13 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7424(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7424(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35435,7 +35517,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7424(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uivEXT), .-GL_PREFIX(VertexAttribI3uivEXT)
@@ -35446,7 +35528,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 GL_PREFIX(VertexAttribI4bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7432(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35456,13 +35538,13 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7432(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7432(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35472,7 +35554,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7432(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4bvEXT), .-GL_PREFIX(VertexAttribI4bvEXT)
@@ -35483,7 +35565,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 GL_PREFIX(VertexAttribI4iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7440(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35497,13 +35579,13 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7440(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7440(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35517,7 +35599,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7440(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4iEXT), .-GL_PREFIX(VertexAttribI4iEXT)
@@ -35528,7 +35610,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 GL_PREFIX(VertexAttribI4ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7448(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35538,13 +35620,13 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7448(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7448(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35554,7 +35636,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7448(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ivEXT), .-GL_PREFIX(VertexAttribI4ivEXT)
@@ -35565,7 +35647,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 GL_PREFIX(VertexAttribI4svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7456(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35575,13 +35657,13 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7456(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7456(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35591,7 +35673,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7456(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4svEXT), .-GL_PREFIX(VertexAttribI4svEXT)
@@ -35602,7 +35684,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 GL_PREFIX(VertexAttribI4ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7464(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35612,13 +35694,13 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7464(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7464(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35628,7 +35710,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7464(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ubvEXT), .-GL_PREFIX(VertexAttribI4ubvEXT)
@@ -35639,7 +35721,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 GL_PREFIX(VertexAttribI4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7472(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35653,13 +35735,13 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7472(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7472(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35673,7 +35755,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7472(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uiEXT), .-GL_PREFIX(VertexAttribI4uiEXT)
@@ -35684,7 +35766,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 GL_PREFIX(VertexAttribI4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7480(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35694,13 +35776,13 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7480(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7480(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35710,7 +35792,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7480(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uivEXT), .-GL_PREFIX(VertexAttribI4uivEXT)
@@ -35721,7 +35803,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 GL_PREFIX(VertexAttribI4usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7488(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35731,13 +35813,13 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7488(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7488(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35747,7 +35829,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7488(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4usvEXT), .-GL_PREFIX(VertexAttribI4usvEXT)
@@ -35758,7 +35840,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 GL_PREFIX(VertexAttribIPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7496(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35772,13 +35854,13 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7496(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7496(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35792,7 +35874,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7496(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribIPointerEXT), .-GL_PREFIX(VertexAttribIPointerEXT)
@@ -35803,7 +35885,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7504(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35817,13 +35899,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7504(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7504(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35837,7 +35919,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7504(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -35848,7 +35930,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ColorMaskIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7512(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35862,13 +35944,13 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7512(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7512(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35882,7 +35964,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7512(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorMaskIndexedEXT), .-GL_PREFIX(ColorMaskIndexedEXT)
@@ -35893,7 +35975,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 GL_PREFIX(DisableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7520(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35903,13 +35985,13 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7520(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7520(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35919,7 +36001,7 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7520(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DisableIndexedEXT), .-GL_PREFIX(DisableIndexedEXT)
@@ -35930,7 +36012,7 @@ GL_PREFIX(DisableIndexedEXT):
 GL_PREFIX(EnableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7528(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35940,13 +36022,13 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7528(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7528(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35956,7 +36038,7 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7528(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EnableIndexedEXT), .-GL_PREFIX(EnableIndexedEXT)
@@ -35967,7 +36049,7 @@ GL_PREFIX(EnableIndexedEXT):
 GL_PREFIX(GetBooleanIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7536(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35977,13 +36059,13 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7536(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7536(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35993,7 +36075,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7536(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBooleanIndexedvEXT), .-GL_PREFIX(GetBooleanIndexedvEXT)
@@ -36004,7 +36086,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 GL_PREFIX(GetIntegerIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7544(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36014,13 +36096,13 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7544(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7544(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36030,7 +36112,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7544(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetIntegerIndexedvEXT), .-GL_PREFIX(GetIntegerIndexedvEXT)
@@ -36041,7 +36123,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 GL_PREFIX(IsEnabledIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7552(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36051,13 +36133,13 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7552(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7552(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36067,7 +36149,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7552(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsEnabledIndexedEXT), .-GL_PREFIX(IsEnabledIndexedEXT)
@@ -36078,7 +36160,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 GL_PREFIX(ClearColorIiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7560(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36092,13 +36174,13 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7560(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7560(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36112,7 +36194,7 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7560(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIiEXT), .-GL_PREFIX(ClearColorIiEXT)
@@ -36123,7 +36205,7 @@ GL_PREFIX(ClearColorIiEXT):
 GL_PREFIX(ClearColorIuiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7568(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36137,13 +36219,13 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7568(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7568(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36157,7 +36239,7 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7568(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIuiEXT), .-GL_PREFIX(ClearColorIuiEXT)
@@ -36168,7 +36250,7 @@ GL_PREFIX(ClearColorIuiEXT):
 GL_PREFIX(GetTexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7576(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36178,13 +36260,13 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7576(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7576(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36194,7 +36276,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7576(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIivEXT), .-GL_PREFIX(GetTexParameterIivEXT)
@@ -36205,7 +36287,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 GL_PREFIX(GetTexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7584(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36215,13 +36297,13 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7584(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7584(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36231,7 +36313,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7584(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIuivEXT), .-GL_PREFIX(GetTexParameterIuivEXT)
@@ -36242,7 +36324,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 GL_PREFIX(TexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7592(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36252,13 +36334,13 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7592(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7592(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36268,7 +36350,7 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7592(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIivEXT), .-GL_PREFIX(TexParameterIivEXT)
@@ -36279,7 +36361,7 @@ GL_PREFIX(TexParameterIivEXT):
 GL_PREFIX(TexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7600(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36289,13 +36371,13 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7600(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7600(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36305,7 +36387,7 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7600(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIuivEXT), .-GL_PREFIX(TexParameterIuivEXT)
@@ -36316,7 +36398,7 @@ GL_PREFIX(TexParameterIuivEXT):
 GL_PREFIX(BeginConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7608(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36326,13 +36408,13 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7608(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7608(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36342,7 +36424,7 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7608(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginConditionalRenderNV), .-GL_PREFIX(BeginConditionalRenderNV)
@@ -36353,25 +36435,25 @@ GL_PREFIX(BeginConditionalRenderNV):
 GL_PREFIX(EndConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7616(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7616(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7616(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7616(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndConditionalRenderNV), .-GL_PREFIX(EndConditionalRenderNV)
@@ -36382,25 +36464,25 @@ GL_PREFIX(EndConditionalRenderNV):
 GL_PREFIX(BeginTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7624(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7624(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7624(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7624(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginTransformFeedbackEXT), .-GL_PREFIX(BeginTransformFeedbackEXT)
@@ -36411,7 +36493,7 @@ GL_PREFIX(BeginTransformFeedbackEXT):
 GL_PREFIX(BindBufferBaseEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7632(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36421,13 +36503,13 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7632(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7632(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36437,7 +36519,7 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7632(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferBaseEXT), .-GL_PREFIX(BindBufferBaseEXT)
@@ -36448,7 +36530,7 @@ GL_PREFIX(BindBufferBaseEXT):
 GL_PREFIX(BindBufferOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7640(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36462,13 +36544,13 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7640(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7640(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36482,7 +36564,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7640(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferOffsetEXT), .-GL_PREFIX(BindBufferOffsetEXT)
@@ -36493,7 +36575,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 GL_PREFIX(BindBufferRangeEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7648(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36507,13 +36589,13 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7648(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7648(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36527,7 +36609,7 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7648(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferRangeEXT), .-GL_PREFIX(BindBufferRangeEXT)
@@ -36538,25 +36620,25 @@ GL_PREFIX(BindBufferRangeEXT):
 GL_PREFIX(EndTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7656(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7656(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7656(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7656(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndTransformFeedbackEXT), .-GL_PREFIX(EndTransformFeedbackEXT)
@@ -36567,7 +36649,7 @@ GL_PREFIX(EndTransformFeedbackEXT):
 GL_PREFIX(GetTransformFeedbackVaryingEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7664(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36585,13 +36667,13 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7664(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7664(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36609,7 +36691,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7664(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTransformFeedbackVaryingEXT), .-GL_PREFIX(GetTransformFeedbackVaryingEXT)
@@ -36620,7 +36702,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 GL_PREFIX(TransformFeedbackVaryingsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7672(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36634,13 +36716,13 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7672(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7672(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36654,7 +36736,7 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7672(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TransformFeedbackVaryingsEXT), .-GL_PREFIX(TransformFeedbackVaryingsEXT)
@@ -36665,37 +36747,37 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7680(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7680(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7680(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7680(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_961)
-	.type	GL_PREFIX(_dispatch_stub_961), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_961))
-GL_PREFIX(_dispatch_stub_961):
+	.globl	GL_PREFIX(_dispatch_stub_963)
+	.type	GL_PREFIX(_dispatch_stub_963), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_963))
+GL_PREFIX(_dispatch_stub_963):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7688(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36705,13 +36787,13 @@ GL_PREFIX(_dispatch_stub_961):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7688(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7688(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36721,19 +36803,19 @@ GL_PREFIX(_dispatch_stub_961):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7688(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_961), .-GL_PREFIX(_dispatch_stub_961)
+	.size	GL_PREFIX(_dispatch_stub_963), .-GL_PREFIX(_dispatch_stub_963)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_962)
-	.type	GL_PREFIX(_dispatch_stub_962), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_962))
-GL_PREFIX(_dispatch_stub_962):
+	.globl	GL_PREFIX(_dispatch_stub_964)
+	.type	GL_PREFIX(_dispatch_stub_964), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_964))
+GL_PREFIX(_dispatch_stub_964):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7696(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36743,13 +36825,13 @@ GL_PREFIX(_dispatch_stub_962):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7696(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7696(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36759,10 +36841,10 @@ GL_PREFIX(_dispatch_stub_962):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7696(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_962), .-GL_PREFIX(_dispatch_stub_962)
+	.size	GL_PREFIX(_dispatch_stub_964), .-GL_PREFIX(_dispatch_stub_964)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetObjectParameterivAPPLE)
@@ -36770,7 +36852,7 @@ GL_PREFIX(_dispatch_stub_962):
 GL_PREFIX(GetObjectParameterivAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7704(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36784,13 +36866,13 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7704(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7704(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36804,7 +36886,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7704(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterivAPPLE), .-GL_PREFIX(GetObjectParameterivAPPLE)
@@ -36815,7 +36897,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 GL_PREFIX(ObjectPurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7712(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36825,13 +36907,13 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7712(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7712(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36841,7 +36923,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7712(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectPurgeableAPPLE), .-GL_PREFIX(ObjectPurgeableAPPLE)
@@ -36852,7 +36934,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 GL_PREFIX(ObjectUnpurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7720(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36862,13 +36944,13 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7720(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7720(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36878,7 +36960,7 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7720(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectUnpurgeableAPPLE), .-GL_PREFIX(ObjectUnpurgeableAPPLE)
@@ -36889,25 +36971,25 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 GL_PREFIX(ActiveProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7728(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7728(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7728(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7728(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ActiveProgramEXT), .-GL_PREFIX(ActiveProgramEXT)
@@ -36918,7 +37000,7 @@ GL_PREFIX(ActiveProgramEXT):
 GL_PREFIX(CreateShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7736(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36928,13 +37010,13 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7736(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7736(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36944,7 +37026,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7736(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CreateShaderProgramEXT), .-GL_PREFIX(CreateShaderProgramEXT)
@@ -36955,7 +37037,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 GL_PREFIX(UseShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7744(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36965,13 +37047,13 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7744(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7744(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36981,7 +37063,7 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7744(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UseShaderProgramEXT), .-GL_PREFIX(UseShaderProgramEXT)
@@ -36992,37 +37074,37 @@ GL_PREFIX(UseShaderProgramEXT):
 GL_PREFIX(TextureBarrierNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7752(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7752(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7752(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7752(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureBarrierNV), .-GL_PREFIX(TextureBarrierNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_970)
-	.type	GL_PREFIX(_dispatch_stub_970), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_970))
-GL_PREFIX(_dispatch_stub_970):
+	.globl	GL_PREFIX(_dispatch_stub_972)
+	.type	GL_PREFIX(_dispatch_stub_972), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_972))
+GL_PREFIX(_dispatch_stub_972):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7760(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37036,13 +37118,13 @@ GL_PREFIX(_dispatch_stub_970):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7760(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7760(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37056,19 +37138,19 @@ GL_PREFIX(_dispatch_stub_970):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7760(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_970), .-GL_PREFIX(_dispatch_stub_970)
+	.size	GL_PREFIX(_dispatch_stub_972), .-GL_PREFIX(_dispatch_stub_972)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_971)
-	.type	GL_PREFIX(_dispatch_stub_971), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_971))
-GL_PREFIX(_dispatch_stub_971):
+	.globl	GL_PREFIX(_dispatch_stub_973)
+	.type	GL_PREFIX(_dispatch_stub_973), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_973))
+GL_PREFIX(_dispatch_stub_973):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7768(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37082,13 +37164,13 @@ GL_PREFIX(_dispatch_stub_971):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7768(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7768(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37102,19 +37184,19 @@ GL_PREFIX(_dispatch_stub_971):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7768(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_971), .-GL_PREFIX(_dispatch_stub_971)
+	.size	GL_PREFIX(_dispatch_stub_973), .-GL_PREFIX(_dispatch_stub_973)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_972)
-	.type	GL_PREFIX(_dispatch_stub_972), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_972))
-GL_PREFIX(_dispatch_stub_972):
+	.globl	GL_PREFIX(_dispatch_stub_974)
+	.type	GL_PREFIX(_dispatch_stub_974), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_974))
+GL_PREFIX(_dispatch_stub_974):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7776(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37128,13 +37210,13 @@ GL_PREFIX(_dispatch_stub_972):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7776(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7776(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37148,19 +37230,19 @@ GL_PREFIX(_dispatch_stub_972):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7776(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_972), .-GL_PREFIX(_dispatch_stub_972)
+	.size	GL_PREFIX(_dispatch_stub_974), .-GL_PREFIX(_dispatch_stub_974)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_973)
-	.type	GL_PREFIX(_dispatch_stub_973), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_973))
-GL_PREFIX(_dispatch_stub_973):
+	.globl	GL_PREFIX(_dispatch_stub_975)
+	.type	GL_PREFIX(_dispatch_stub_975), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_975))
+GL_PREFIX(_dispatch_stub_975):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7784(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37170,13 +37252,13 @@ GL_PREFIX(_dispatch_stub_973):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7784(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7784(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37186,19 +37268,19 @@ GL_PREFIX(_dispatch_stub_973):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7784(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_973), .-GL_PREFIX(_dispatch_stub_973)
+	.size	GL_PREFIX(_dispatch_stub_975), .-GL_PREFIX(_dispatch_stub_975)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_974)
-	.type	GL_PREFIX(_dispatch_stub_974), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_974))
-GL_PREFIX(_dispatch_stub_974):
+	.globl	GL_PREFIX(_dispatch_stub_976)
+	.type	GL_PREFIX(_dispatch_stub_976), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_976))
+GL_PREFIX(_dispatch_stub_976):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7792(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37208,13 +37290,13 @@ GL_PREFIX(_dispatch_stub_974):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7792(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7792(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37224,10 +37306,10 @@ GL_PREFIX(_dispatch_stub_974):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7792(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_974), .-GL_PREFIX(_dispatch_stub_974)
+	.size	GL_PREFIX(_dispatch_stub_976), .-GL_PREFIX(_dispatch_stub_976)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -37235,7 +37317,7 @@ GL_PREFIX(_dispatch_stub_974):
 GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7800(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37245,13 +37327,13 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7800(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7800(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37261,7 +37343,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7800(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -37272,7 +37354,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 GL_PREFIX(EGLImageTargetTexture2DOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7808(%rax), %r11
+	movq	7824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37282,13 +37364,13 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7808(%rax), %r11
+	movq	7824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7808(%rax), %r11
+	movq	7824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37298,7 +37380,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7808(%rax), %r11
+	movq	7824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
@@ -37566,10 +37648,10 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_871)
-	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_873)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_873)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_875)
 	.globl GL_PREFIX(PrimitiveRestartIndex) ; .set GL_PREFIX(PrimitiveRestartIndex), GL_PREFIX(PrimitiveRestartIndexNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_883)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_885)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -37587,7 +37669,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_901)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_903)
 	.globl GL_PREFIX(BindFragDataLocation) ; .set GL_PREFIX(BindFragDataLocation), GL_PREFIX(BindFragDataLocationEXT)
 	.globl GL_PREFIX(GetFragDataLocation) ; .set GL_PREFIX(GetFragDataLocation), GL_PREFIX(GetFragDataLocationEXT)
 	.globl GL_PREFIX(GetUniformuiv) ; .set GL_PREFIX(GetUniformuiv), GL_PREFIX(GetUniformuivEXT)
diff --git a/mesalib/src/mapi/glapi/glapi_x86.S b/mesalib/src/mapi/glapi/glapi_x86.S
index a50923d32..8d0bbf7f9 100644
--- a/mesalib/src/mapi/glapi/glapi_x86.S
+++ b/mesalib/src/mapi/glapi/glapi_x86.S
@@ -751,105 +751,103 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(BlendEquationiARB, 598, BlendEquationiARB@8)
 	GL_STUB(BlendFuncSeparateiARB, 599, BlendFuncSeparateiARB@20)
 	GL_STUB(BlendFunciARB, 600, BlendFunciARB@12)
-	GL_STUB(BindSampler, 601, BindSampler@8)
-	GL_STUB(DeleteSamplers, 602, DeleteSamplers@8)
-	GL_STUB(GenSamplers, 603, GenSamplers@8)
-	GL_STUB(GetSamplerParameterIiv, 604, GetSamplerParameterIiv@12)
-	GL_STUB(GetSamplerParameterIuiv, 605, GetSamplerParameterIuiv@12)
-	GL_STUB(GetSamplerParameterfv, 606, GetSamplerParameterfv@12)
-	GL_STUB(GetSamplerParameteriv, 607, GetSamplerParameteriv@12)
-	GL_STUB(IsSampler, 608, IsSampler@4)
-	GL_STUB(SamplerParameterIiv, 609, SamplerParameterIiv@12)
-	GL_STUB(SamplerParameterIuiv, 610, SamplerParameterIuiv@12)
-	GL_STUB(SamplerParameterf, 611, SamplerParameterf@12)
-	GL_STUB(SamplerParameterfv, 612, SamplerParameterfv@12)
-	GL_STUB(SamplerParameteri, 613, SamplerParameteri@12)
-	GL_STUB(SamplerParameteriv, 614, SamplerParameteriv@12)
-	GL_STUB(ColorP3ui, 615, ColorP3ui@8)
-	GL_STUB(ColorP3uiv, 616, ColorP3uiv@8)
-	GL_STUB(ColorP4ui, 617, ColorP4ui@8)
-	GL_STUB(ColorP4uiv, 618, ColorP4uiv@8)
-	GL_STUB(MultiTexCoordP1ui, 619, MultiTexCoordP1ui@12)
-	GL_STUB(MultiTexCoordP1uiv, 620, MultiTexCoordP1uiv@12)
-	GL_STUB(MultiTexCoordP2ui, 621, MultiTexCoordP2ui@12)
-	GL_STUB(MultiTexCoordP2uiv, 622, MultiTexCoordP2uiv@12)
-	GL_STUB(MultiTexCoordP3ui, 623, MultiTexCoordP3ui@12)
-	GL_STUB(MultiTexCoordP3uiv, 624, MultiTexCoordP3uiv@12)
-	GL_STUB(MultiTexCoordP4ui, 625, MultiTexCoordP4ui@12)
-	GL_STUB(MultiTexCoordP4uiv, 626, MultiTexCoordP4uiv@12)
-	GL_STUB(NormalP3ui, 627, NormalP3ui@8)
-	GL_STUB(NormalP3uiv, 628, NormalP3uiv@8)
-	GL_STUB(SecondaryColorP3ui, 629, SecondaryColorP3ui@8)
-	GL_STUB(SecondaryColorP3uiv, 630, SecondaryColorP3uiv@8)
-	GL_STUB(TexCoordP1ui, 631, TexCoordP1ui@8)
-	GL_STUB(TexCoordP1uiv, 632, TexCoordP1uiv@8)
-	GL_STUB(TexCoordP2ui, 633, TexCoordP2ui@8)
-	GL_STUB(TexCoordP2uiv, 634, TexCoordP2uiv@8)
-	GL_STUB(TexCoordP3ui, 635, TexCoordP3ui@8)
-	GL_STUB(TexCoordP3uiv, 636, TexCoordP3uiv@8)
-	GL_STUB(TexCoordP4ui, 637, TexCoordP4ui@8)
-	GL_STUB(TexCoordP4uiv, 638, TexCoordP4uiv@8)
-	GL_STUB(VertexAttribP1ui, 639, VertexAttribP1ui@16)
-	GL_STUB(VertexAttribP1uiv, 640, VertexAttribP1uiv@16)
-	GL_STUB(VertexAttribP2ui, 641, VertexAttribP2ui@16)
-	GL_STUB(VertexAttribP2uiv, 642, VertexAttribP2uiv@16)
-	GL_STUB(VertexAttribP3ui, 643, VertexAttribP3ui@16)
-	GL_STUB(VertexAttribP3uiv, 644, VertexAttribP3uiv@16)
-	GL_STUB(VertexAttribP4ui, 645, VertexAttribP4ui@16)
-	GL_STUB(VertexAttribP4uiv, 646, VertexAttribP4uiv@16)
-	GL_STUB(VertexP2ui, 647, VertexP2ui@8)
-	GL_STUB(VertexP2uiv, 648, VertexP2uiv@8)
-	GL_STUB(VertexP3ui, 649, VertexP3ui@8)
-	GL_STUB(VertexP3uiv, 650, VertexP3uiv@8)
-	GL_STUB(VertexP4ui, 651, VertexP4ui@8)
-	GL_STUB(VertexP4uiv, 652, VertexP4uiv@8)
-	GL_STUB(BindTransformFeedback, 653, BindTransformFeedback@8)
-	GL_STUB(DeleteTransformFeedbacks, 654, DeleteTransformFeedbacks@8)
-	GL_STUB(DrawTransformFeedback, 655, DrawTransformFeedback@8)
-	GL_STUB(GenTransformFeedbacks, 656, GenTransformFeedbacks@8)
-	GL_STUB(IsTransformFeedback, 657, IsTransformFeedback@4)
-	GL_STUB(PauseTransformFeedback, 658, PauseTransformFeedback@0)
-	GL_STUB(ResumeTransformFeedback, 659, ResumeTransformFeedback@0)
-	GL_STUB(ClearDepthf, 660, ClearDepthf@4)
-	GL_STUB(DepthRangef, 661, DepthRangef@8)
-	GL_STUB(GetShaderPrecisionFormat, 662, GetShaderPrecisionFormat@16)
-	GL_STUB(ReleaseShaderCompiler, 663, ReleaseShaderCompiler@0)
-	GL_STUB(ShaderBinary, 664, ShaderBinary@20)
-	GL_STUB(DebugMessageCallbackARB, 665, DebugMessageCallbackARB@8)
-	GL_STUB(DebugMessageControlARB, 666, DebugMessageControlARB@24)
-	GL_STUB(DebugMessageInsertARB, 667, DebugMessageInsertARB@24)
-	GL_STUB(GetDebugMessageLogARB, 668, GetDebugMessageLogARB@32)
-	GL_STUB(GetGraphicsResetStatusARB, 669, GetGraphicsResetStatusARB@0)
-	GL_STUB(GetnColorTableARB, 670, GetnColorTableARB@20)
-	GL_STUB(GetnCompressedTexImageARB, 671, GetnCompressedTexImageARB@16)
-	GL_STUB(GetnConvolutionFilterARB, 672, GetnConvolutionFilterARB@20)
-	GL_STUB(GetnHistogramARB, 673, GetnHistogramARB@24)
-	GL_STUB(GetnMapdvARB, 674, GetnMapdvARB@16)
-	GL_STUB(GetnMapfvARB, 675, GetnMapfvARB@16)
-	GL_STUB(GetnMapivARB, 676, GetnMapivARB@16)
-	GL_STUB(GetnMinmaxARB, 677, GetnMinmaxARB@24)
-	GL_STUB(GetnPixelMapfvARB, 678, GetnPixelMapfvARB@12)
-	GL_STUB(GetnPixelMapuivARB, 679, GetnPixelMapuivARB@12)
-	GL_STUB(GetnPixelMapusvARB, 680, GetnPixelMapusvARB@12)
-	GL_STUB(GetnPolygonStippleARB, 681, GetnPolygonStippleARB@8)
-	GL_STUB(GetnSeparableFilterARB, 682, GetnSeparableFilterARB@32)
-	GL_STUB(GetnTexImageARB, 683, GetnTexImageARB@24)
-	GL_STUB(GetnUniformdvARB, 684, GetnUniformdvARB@16)
-	GL_STUB(GetnUniformfvARB, 685, GetnUniformfvARB@16)
-	GL_STUB(GetnUniformivARB, 686, GetnUniformivARB@16)
-	GL_STUB(GetnUniformuivARB, 687, GetnUniformuivARB@16)
-	GL_STUB(ReadnPixelsARB, 688, ReadnPixelsARB@32)
-	GL_STUB(TexStorage1D, 689, TexStorage1D@16)
-	GL_STUB(TexStorage2D, 690, TexStorage2D@20)
-	GL_STUB(TexStorage3D, 691, TexStorage3D@24)
-	GL_STUB(TextureStorage1DEXT, 692, TextureStorage1DEXT@20)
-	GL_STUB(TextureStorage2DEXT, 693, TextureStorage2DEXT@24)
-	GL_STUB(TextureStorage3DEXT, 694, TextureStorage3DEXT@28)
-	GL_STUB(PolygonOffsetEXT, 695, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_696, 696, _dispatch_stub_696@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_696, _dispatch_stub_696@8))
-	GL_STUB(_dispatch_stub_697, 697, _dispatch_stub_697@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_697, _dispatch_stub_697@8))
+	GL_STUB(BindFragDataLocationIndexed, 601, BindFragDataLocationIndexed@16)
+	GL_STUB(GetFragDataIndex, 602, GetFragDataIndex@8)
+	GL_STUB(BindSampler, 603, BindSampler@8)
+	GL_STUB(DeleteSamplers, 604, DeleteSamplers@8)
+	GL_STUB(GenSamplers, 605, GenSamplers@8)
+	GL_STUB(GetSamplerParameterIiv, 606, GetSamplerParameterIiv@12)
+	GL_STUB(GetSamplerParameterIuiv, 607, GetSamplerParameterIuiv@12)
+	GL_STUB(GetSamplerParameterfv, 608, GetSamplerParameterfv@12)
+	GL_STUB(GetSamplerParameteriv, 609, GetSamplerParameteriv@12)
+	GL_STUB(IsSampler, 610, IsSampler@4)
+	GL_STUB(SamplerParameterIiv, 611, SamplerParameterIiv@12)
+	GL_STUB(SamplerParameterIuiv, 612, SamplerParameterIuiv@12)
+	GL_STUB(SamplerParameterf, 613, SamplerParameterf@12)
+	GL_STUB(SamplerParameterfv, 614, SamplerParameterfv@12)
+	GL_STUB(SamplerParameteri, 615, SamplerParameteri@12)
+	GL_STUB(SamplerParameteriv, 616, SamplerParameteriv@12)
+	GL_STUB(ColorP3ui, 617, ColorP3ui@8)
+	GL_STUB(ColorP3uiv, 618, ColorP3uiv@8)
+	GL_STUB(ColorP4ui, 619, ColorP4ui@8)
+	GL_STUB(ColorP4uiv, 620, ColorP4uiv@8)
+	GL_STUB(MultiTexCoordP1ui, 621, MultiTexCoordP1ui@12)
+	GL_STUB(MultiTexCoordP1uiv, 622, MultiTexCoordP1uiv@12)
+	GL_STUB(MultiTexCoordP2ui, 623, MultiTexCoordP2ui@12)
+	GL_STUB(MultiTexCoordP2uiv, 624, MultiTexCoordP2uiv@12)
+	GL_STUB(MultiTexCoordP3ui, 625, MultiTexCoordP3ui@12)
+	GL_STUB(MultiTexCoordP3uiv, 626, MultiTexCoordP3uiv@12)
+	GL_STUB(MultiTexCoordP4ui, 627, MultiTexCoordP4ui@12)
+	GL_STUB(MultiTexCoordP4uiv, 628, MultiTexCoordP4uiv@12)
+	GL_STUB(NormalP3ui, 629, NormalP3ui@8)
+	GL_STUB(NormalP3uiv, 630, NormalP3uiv@8)
+	GL_STUB(SecondaryColorP3ui, 631, SecondaryColorP3ui@8)
+	GL_STUB(SecondaryColorP3uiv, 632, SecondaryColorP3uiv@8)
+	GL_STUB(TexCoordP1ui, 633, TexCoordP1ui@8)
+	GL_STUB(TexCoordP1uiv, 634, TexCoordP1uiv@8)
+	GL_STUB(TexCoordP2ui, 635, TexCoordP2ui@8)
+	GL_STUB(TexCoordP2uiv, 636, TexCoordP2uiv@8)
+	GL_STUB(TexCoordP3ui, 637, TexCoordP3ui@8)
+	GL_STUB(TexCoordP3uiv, 638, TexCoordP3uiv@8)
+	GL_STUB(TexCoordP4ui, 639, TexCoordP4ui@8)
+	GL_STUB(TexCoordP4uiv, 640, TexCoordP4uiv@8)
+	GL_STUB(VertexAttribP1ui, 641, VertexAttribP1ui@16)
+	GL_STUB(VertexAttribP1uiv, 642, VertexAttribP1uiv@16)
+	GL_STUB(VertexAttribP2ui, 643, VertexAttribP2ui@16)
+	GL_STUB(VertexAttribP2uiv, 644, VertexAttribP2uiv@16)
+	GL_STUB(VertexAttribP3ui, 645, VertexAttribP3ui@16)
+	GL_STUB(VertexAttribP3uiv, 646, VertexAttribP3uiv@16)
+	GL_STUB(VertexAttribP4ui, 647, VertexAttribP4ui@16)
+	GL_STUB(VertexAttribP4uiv, 648, VertexAttribP4uiv@16)
+	GL_STUB(VertexP2ui, 649, VertexP2ui@8)
+	GL_STUB(VertexP2uiv, 650, VertexP2uiv@8)
+	GL_STUB(VertexP3ui, 651, VertexP3ui@8)
+	GL_STUB(VertexP3uiv, 652, VertexP3uiv@8)
+	GL_STUB(VertexP4ui, 653, VertexP4ui@8)
+	GL_STUB(VertexP4uiv, 654, VertexP4uiv@8)
+	GL_STUB(BindTransformFeedback, 655, BindTransformFeedback@8)
+	GL_STUB(DeleteTransformFeedbacks, 656, DeleteTransformFeedbacks@8)
+	GL_STUB(DrawTransformFeedback, 657, DrawTransformFeedback@8)
+	GL_STUB(GenTransformFeedbacks, 658, GenTransformFeedbacks@8)
+	GL_STUB(IsTransformFeedback, 659, IsTransformFeedback@4)
+	GL_STUB(PauseTransformFeedback, 660, PauseTransformFeedback@0)
+	GL_STUB(ResumeTransformFeedback, 661, ResumeTransformFeedback@0)
+	GL_STUB(ClearDepthf, 662, ClearDepthf@4)
+	GL_STUB(DepthRangef, 663, DepthRangef@8)
+	GL_STUB(GetShaderPrecisionFormat, 664, GetShaderPrecisionFormat@16)
+	GL_STUB(ReleaseShaderCompiler, 665, ReleaseShaderCompiler@0)
+	GL_STUB(ShaderBinary, 666, ShaderBinary@20)
+	GL_STUB(DebugMessageCallbackARB, 667, DebugMessageCallbackARB@8)
+	GL_STUB(DebugMessageControlARB, 668, DebugMessageControlARB@24)
+	GL_STUB(DebugMessageInsertARB, 669, DebugMessageInsertARB@24)
+	GL_STUB(GetDebugMessageLogARB, 670, GetDebugMessageLogARB@32)
+	GL_STUB(GetGraphicsResetStatusARB, 671, GetGraphicsResetStatusARB@0)
+	GL_STUB(GetnColorTableARB, 672, GetnColorTableARB@20)
+	GL_STUB(GetnCompressedTexImageARB, 673, GetnCompressedTexImageARB@16)
+	GL_STUB(GetnConvolutionFilterARB, 674, GetnConvolutionFilterARB@20)
+	GL_STUB(GetnHistogramARB, 675, GetnHistogramARB@24)
+	GL_STUB(GetnMapdvARB, 676, GetnMapdvARB@16)
+	GL_STUB(GetnMapfvARB, 677, GetnMapfvARB@16)
+	GL_STUB(GetnMapivARB, 678, GetnMapivARB@16)
+	GL_STUB(GetnMinmaxARB, 679, GetnMinmaxARB@24)
+	GL_STUB(GetnPixelMapfvARB, 680, GetnPixelMapfvARB@12)
+	GL_STUB(GetnPixelMapuivARB, 681, GetnPixelMapuivARB@12)
+	GL_STUB(GetnPixelMapusvARB, 682, GetnPixelMapusvARB@12)
+	GL_STUB(GetnPolygonStippleARB, 683, GetnPolygonStippleARB@8)
+	GL_STUB(GetnSeparableFilterARB, 684, GetnSeparableFilterARB@32)
+	GL_STUB(GetnTexImageARB, 685, GetnTexImageARB@24)
+	GL_STUB(GetnUniformdvARB, 686, GetnUniformdvARB@16)
+	GL_STUB(GetnUniformfvARB, 687, GetnUniformfvARB@16)
+	GL_STUB(GetnUniformivARB, 688, GetnUniformivARB@16)
+	GL_STUB(GetnUniformuivARB, 689, GetnUniformuivARB@16)
+	GL_STUB(ReadnPixelsARB, 690, ReadnPixelsARB@32)
+	GL_STUB(TexStorage1D, 691, TexStorage1D@16)
+	GL_STUB(TexStorage2D, 692, TexStorage2D@20)
+	GL_STUB(TexStorage3D, 693, TexStorage3D@24)
+	GL_STUB(TextureStorage1DEXT, 694, TextureStorage1DEXT@20)
+	GL_STUB(TextureStorage2DEXT, 695, TextureStorage2DEXT@24)
+	GL_STUB(TextureStorage3DEXT, 696, TextureStorage3DEXT@28)
+	GL_STUB(PolygonOffsetEXT, 697, PolygonOffsetEXT@8)
 	GL_STUB(_dispatch_stub_698, 698, _dispatch_stub_698@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_698, _dispatch_stub_698@8))
 	GL_STUB(_dispatch_stub_699, 699, _dispatch_stub_699@8)
@@ -860,308 +858,312 @@ GLNAME(gl_dispatch_functions_start):
 	HIDDEN(GL_PREFIX(_dispatch_stub_701, _dispatch_stub_701@8))
 	GL_STUB(_dispatch_stub_702, 702, _dispatch_stub_702@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_702, _dispatch_stub_702@8))
-	GL_STUB(_dispatch_stub_703, 703, _dispatch_stub_703@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_703, _dispatch_stub_703@4))
-	GL_STUB(ColorPointerEXT, 704, ColorPointerEXT@20)
-	GL_STUB(EdgeFlagPointerEXT, 705, EdgeFlagPointerEXT@12)
-	GL_STUB(IndexPointerEXT, 706, IndexPointerEXT@16)
-	GL_STUB(NormalPointerEXT, 707, NormalPointerEXT@16)
-	GL_STUB(TexCoordPointerEXT, 708, TexCoordPointerEXT@20)
-	GL_STUB(VertexPointerEXT, 709, VertexPointerEXT@20)
-	GL_STUB(PointParameterfEXT, 710, PointParameterfEXT@8)
-	GL_STUB(PointParameterfvEXT, 711, PointParameterfvEXT@8)
-	GL_STUB(LockArraysEXT, 712, LockArraysEXT@8)
-	GL_STUB(UnlockArraysEXT, 713, UnlockArraysEXT@0)
-	GL_STUB(SecondaryColor3bEXT, 714, SecondaryColor3bEXT@12)
-	GL_STUB(SecondaryColor3bvEXT, 715, SecondaryColor3bvEXT@4)
-	GL_STUB(SecondaryColor3dEXT, 716, SecondaryColor3dEXT@24)
-	GL_STUB(SecondaryColor3dvEXT, 717, SecondaryColor3dvEXT@4)
-	GL_STUB(SecondaryColor3fEXT, 718, SecondaryColor3fEXT@12)
-	GL_STUB(SecondaryColor3fvEXT, 719, SecondaryColor3fvEXT@4)
-	GL_STUB(SecondaryColor3iEXT, 720, SecondaryColor3iEXT@12)
-	GL_STUB(SecondaryColor3ivEXT, 721, SecondaryColor3ivEXT@4)
-	GL_STUB(SecondaryColor3sEXT, 722, SecondaryColor3sEXT@12)
-	GL_STUB(SecondaryColor3svEXT, 723, SecondaryColor3svEXT@4)
-	GL_STUB(SecondaryColor3ubEXT, 724, SecondaryColor3ubEXT@12)
-	GL_STUB(SecondaryColor3ubvEXT, 725, SecondaryColor3ubvEXT@4)
-	GL_STUB(SecondaryColor3uiEXT, 726, SecondaryColor3uiEXT@12)
-	GL_STUB(SecondaryColor3uivEXT, 727, SecondaryColor3uivEXT@4)
-	GL_STUB(SecondaryColor3usEXT, 728, SecondaryColor3usEXT@12)
-	GL_STUB(SecondaryColor3usvEXT, 729, SecondaryColor3usvEXT@4)
-	GL_STUB(SecondaryColorPointerEXT, 730, SecondaryColorPointerEXT@16)
-	GL_STUB(MultiDrawArraysEXT, 731, MultiDrawArraysEXT@16)
-	GL_STUB(MultiDrawElementsEXT, 732, MultiDrawElementsEXT@20)
-	GL_STUB(FogCoordPointerEXT, 733, FogCoordPointerEXT@12)
-	GL_STUB(FogCoorddEXT, 734, FogCoorddEXT@8)
-	GL_STUB(FogCoorddvEXT, 735, FogCoorddvEXT@4)
-	GL_STUB(FogCoordfEXT, 736, FogCoordfEXT@4)
-	GL_STUB(FogCoordfvEXT, 737, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_738, 738, _dispatch_stub_738@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
-	GL_STUB(BlendFuncSeparateEXT, 739, BlendFuncSeparateEXT@16)
-	GL_STUB(FlushVertexArrayRangeNV, 740, FlushVertexArrayRangeNV@0)
-	GL_STUB(VertexArrayRangeNV, 741, VertexArrayRangeNV@8)
-	GL_STUB(CombinerInputNV, 742, CombinerInputNV@24)
-	GL_STUB(CombinerOutputNV, 743, CombinerOutputNV@40)
-	GL_STUB(CombinerParameterfNV, 744, CombinerParameterfNV@8)
-	GL_STUB(CombinerParameterfvNV, 745, CombinerParameterfvNV@8)
-	GL_STUB(CombinerParameteriNV, 746, CombinerParameteriNV@8)
-	GL_STUB(CombinerParameterivNV, 747, CombinerParameterivNV@8)
-	GL_STUB(FinalCombinerInputNV, 748, FinalCombinerInputNV@16)
-	GL_STUB(GetCombinerInputParameterfvNV, 749, GetCombinerInputParameterfvNV@20)
-	GL_STUB(GetCombinerInputParameterivNV, 750, GetCombinerInputParameterivNV@20)
-	GL_STUB(GetCombinerOutputParameterfvNV, 751, GetCombinerOutputParameterfvNV@16)
-	GL_STUB(GetCombinerOutputParameterivNV, 752, GetCombinerOutputParameterivNV@16)
-	GL_STUB(GetFinalCombinerInputParameterfvNV, 753, GetFinalCombinerInputParameterfvNV@12)
-	GL_STUB(GetFinalCombinerInputParameterivNV, 754, GetFinalCombinerInputParameterivNV@12)
-	GL_STUB(ResizeBuffersMESA, 755, ResizeBuffersMESA@0)
-	GL_STUB(WindowPos2dMESA, 756, WindowPos2dMESA@16)
-	GL_STUB(WindowPos2dvMESA, 757, WindowPos2dvMESA@4)
-	GL_STUB(WindowPos2fMESA, 758, WindowPos2fMESA@8)
-	GL_STUB(WindowPos2fvMESA, 759, WindowPos2fvMESA@4)
-	GL_STUB(WindowPos2iMESA, 760, WindowPos2iMESA@8)
-	GL_STUB(WindowPos2ivMESA, 761, WindowPos2ivMESA@4)
-	GL_STUB(WindowPos2sMESA, 762, WindowPos2sMESA@8)
-	GL_STUB(WindowPos2svMESA, 763, WindowPos2svMESA@4)
-	GL_STUB(WindowPos3dMESA, 764, WindowPos3dMESA@24)
-	GL_STUB(WindowPos3dvMESA, 765, WindowPos3dvMESA@4)
-	GL_STUB(WindowPos3fMESA, 766, WindowPos3fMESA@12)
-	GL_STUB(WindowPos3fvMESA, 767, WindowPos3fvMESA@4)
-	GL_STUB(WindowPos3iMESA, 768, WindowPos3iMESA@12)
-	GL_STUB(WindowPos3ivMESA, 769, WindowPos3ivMESA@4)
-	GL_STUB(WindowPos3sMESA, 770, WindowPos3sMESA@12)
-	GL_STUB(WindowPos3svMESA, 771, WindowPos3svMESA@4)
-	GL_STUB(WindowPos4dMESA, 772, WindowPos4dMESA@32)
-	GL_STUB(WindowPos4dvMESA, 773, WindowPos4dvMESA@4)
-	GL_STUB(WindowPos4fMESA, 774, WindowPos4fMESA@16)
-	GL_STUB(WindowPos4fvMESA, 775, WindowPos4fvMESA@4)
-	GL_STUB(WindowPos4iMESA, 776, WindowPos4iMESA@16)
-	GL_STUB(WindowPos4ivMESA, 777, WindowPos4ivMESA@4)
-	GL_STUB(WindowPos4sMESA, 778, WindowPos4sMESA@16)
-	GL_STUB(WindowPos4svMESA, 779, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_780, 780, _dispatch_stub_780@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@20))
-	GL_STUB(_dispatch_stub_781, 781, _dispatch_stub_781@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@24))
-	GL_STUB(_dispatch_stub_782, 782, _dispatch_stub_782@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@8))
-	GL_STUB(_dispatch_stub_783, 783, _dispatch_stub_783@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@4))
+	GL_STUB(_dispatch_stub_703, 703, _dispatch_stub_703@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_703, _dispatch_stub_703@8))
+	GL_STUB(_dispatch_stub_704, 704, _dispatch_stub_704@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_704, _dispatch_stub_704@8))
+	GL_STUB(_dispatch_stub_705, 705, _dispatch_stub_705@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_705, _dispatch_stub_705@4))
+	GL_STUB(ColorPointerEXT, 706, ColorPointerEXT@20)
+	GL_STUB(EdgeFlagPointerEXT, 707, EdgeFlagPointerEXT@12)
+	GL_STUB(IndexPointerEXT, 708, IndexPointerEXT@16)
+	GL_STUB(NormalPointerEXT, 709, NormalPointerEXT@16)
+	GL_STUB(TexCoordPointerEXT, 710, TexCoordPointerEXT@20)
+	GL_STUB(VertexPointerEXT, 711, VertexPointerEXT@20)
+	GL_STUB(PointParameterfEXT, 712, PointParameterfEXT@8)
+	GL_STUB(PointParameterfvEXT, 713, PointParameterfvEXT@8)
+	GL_STUB(LockArraysEXT, 714, LockArraysEXT@8)
+	GL_STUB(UnlockArraysEXT, 715, UnlockArraysEXT@0)
+	GL_STUB(SecondaryColor3bEXT, 716, SecondaryColor3bEXT@12)
+	GL_STUB(SecondaryColor3bvEXT, 717, SecondaryColor3bvEXT@4)
+	GL_STUB(SecondaryColor3dEXT, 718, SecondaryColor3dEXT@24)
+	GL_STUB(SecondaryColor3dvEXT, 719, SecondaryColor3dvEXT@4)
+	GL_STUB(SecondaryColor3fEXT, 720, SecondaryColor3fEXT@12)
+	GL_STUB(SecondaryColor3fvEXT, 721, SecondaryColor3fvEXT@4)
+	GL_STUB(SecondaryColor3iEXT, 722, SecondaryColor3iEXT@12)
+	GL_STUB(SecondaryColor3ivEXT, 723, SecondaryColor3ivEXT@4)
+	GL_STUB(SecondaryColor3sEXT, 724, SecondaryColor3sEXT@12)
+	GL_STUB(SecondaryColor3svEXT, 725, SecondaryColor3svEXT@4)
+	GL_STUB(SecondaryColor3ubEXT, 726, SecondaryColor3ubEXT@12)
+	GL_STUB(SecondaryColor3ubvEXT, 727, SecondaryColor3ubvEXT@4)
+	GL_STUB(SecondaryColor3uiEXT, 728, SecondaryColor3uiEXT@12)
+	GL_STUB(SecondaryColor3uivEXT, 729, SecondaryColor3uivEXT@4)
+	GL_STUB(SecondaryColor3usEXT, 730, SecondaryColor3usEXT@12)
+	GL_STUB(SecondaryColor3usvEXT, 731, SecondaryColor3usvEXT@4)
+	GL_STUB(SecondaryColorPointerEXT, 732, SecondaryColorPointerEXT@16)
+	GL_STUB(MultiDrawArraysEXT, 733, MultiDrawArraysEXT@16)
+	GL_STUB(MultiDrawElementsEXT, 734, MultiDrawElementsEXT@20)
+	GL_STUB(FogCoordPointerEXT, 735, FogCoordPointerEXT@12)
+	GL_STUB(FogCoorddEXT, 736, FogCoorddEXT@8)
+	GL_STUB(FogCoorddvEXT, 737, FogCoorddvEXT@4)
+	GL_STUB(FogCoordfEXT, 738, FogCoordfEXT@4)
+	GL_STUB(FogCoordfvEXT, 739, FogCoordfvEXT@4)
+	GL_STUB(_dispatch_stub_740, 740, _dispatch_stub_740@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@4))
+	GL_STUB(BlendFuncSeparateEXT, 741, BlendFuncSeparateEXT@16)
+	GL_STUB(FlushVertexArrayRangeNV, 742, FlushVertexArrayRangeNV@0)
+	GL_STUB(VertexArrayRangeNV, 743, VertexArrayRangeNV@8)
+	GL_STUB(CombinerInputNV, 744, CombinerInputNV@24)
+	GL_STUB(CombinerOutputNV, 745, CombinerOutputNV@40)
+	GL_STUB(CombinerParameterfNV, 746, CombinerParameterfNV@8)
+	GL_STUB(CombinerParameterfvNV, 747, CombinerParameterfvNV@8)
+	GL_STUB(CombinerParameteriNV, 748, CombinerParameteriNV@8)
+	GL_STUB(CombinerParameterivNV, 749, CombinerParameterivNV@8)
+	GL_STUB(FinalCombinerInputNV, 750, FinalCombinerInputNV@16)
+	GL_STUB(GetCombinerInputParameterfvNV, 751, GetCombinerInputParameterfvNV@20)
+	GL_STUB(GetCombinerInputParameterivNV, 752, GetCombinerInputParameterivNV@20)
+	GL_STUB(GetCombinerOutputParameterfvNV, 753, GetCombinerOutputParameterfvNV@16)
+	GL_STUB(GetCombinerOutputParameterivNV, 754, GetCombinerOutputParameterivNV@16)
+	GL_STUB(GetFinalCombinerInputParameterfvNV, 755, GetFinalCombinerInputParameterfvNV@12)
+	GL_STUB(GetFinalCombinerInputParameterivNV, 756, GetFinalCombinerInputParameterivNV@12)
+	GL_STUB(ResizeBuffersMESA, 757, ResizeBuffersMESA@0)
+	GL_STUB(WindowPos2dMESA, 758, WindowPos2dMESA@16)
+	GL_STUB(WindowPos2dvMESA, 759, WindowPos2dvMESA@4)
+	GL_STUB(WindowPos2fMESA, 760, WindowPos2fMESA@8)
+	GL_STUB(WindowPos2fvMESA, 761, WindowPos2fvMESA@4)
+	GL_STUB(WindowPos2iMESA, 762, WindowPos2iMESA@8)
+	GL_STUB(WindowPos2ivMESA, 763, WindowPos2ivMESA@4)
+	GL_STUB(WindowPos2sMESA, 764, WindowPos2sMESA@8)
+	GL_STUB(WindowPos2svMESA, 765, WindowPos2svMESA@4)
+	GL_STUB(WindowPos3dMESA, 766, WindowPos3dMESA@24)
+	GL_STUB(WindowPos3dvMESA, 767, WindowPos3dvMESA@4)
+	GL_STUB(WindowPos3fMESA, 768, WindowPos3fMESA@12)
+	GL_STUB(WindowPos3fvMESA, 769, WindowPos3fvMESA@4)
+	GL_STUB(WindowPos3iMESA, 770, WindowPos3iMESA@12)
+	GL_STUB(WindowPos3ivMESA, 771, WindowPos3ivMESA@4)
+	GL_STUB(WindowPos3sMESA, 772, WindowPos3sMESA@12)
+	GL_STUB(WindowPos3svMESA, 773, WindowPos3svMESA@4)
+	GL_STUB(WindowPos4dMESA, 774, WindowPos4dMESA@32)
+	GL_STUB(WindowPos4dvMESA, 775, WindowPos4dvMESA@4)
+	GL_STUB(WindowPos4fMESA, 776, WindowPos4fMESA@16)
+	GL_STUB(WindowPos4fvMESA, 777, WindowPos4fvMESA@4)
+	GL_STUB(WindowPos4iMESA, 778, WindowPos4iMESA@16)
+	GL_STUB(WindowPos4ivMESA, 779, WindowPos4ivMESA@4)
+	GL_STUB(WindowPos4sMESA, 780, WindowPos4sMESA@16)
+	GL_STUB(WindowPos4svMESA, 781, WindowPos4svMESA@4)
+	GL_STUB(_dispatch_stub_782, 782, _dispatch_stub_782@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@20))
+	GL_STUB(_dispatch_stub_783, 783, _dispatch_stub_783@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@24))
 	GL_STUB(_dispatch_stub_784, 784, _dispatch_stub_784@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@8))
-	GL_STUB(_dispatch_stub_785, 785, _dispatch_stub_785@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@12))
-	GL_STUB(_dispatch_stub_786, 786, _dispatch_stub_786@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@4))
-	GL_STUB(_dispatch_stub_787, 787, _dispatch_stub_787@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@8))
+	GL_STUB(_dispatch_stub_785, 785, _dispatch_stub_785@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@4))
+	GL_STUB(_dispatch_stub_786, 786, _dispatch_stub_786@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@8))
+	GL_STUB(_dispatch_stub_787, 787, _dispatch_stub_787@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@12))
 	GL_STUB(_dispatch_stub_788, 788, _dispatch_stub_788@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@4))
-	GL_STUB(AreProgramsResidentNV, 789, AreProgramsResidentNV@12)
-	GL_STUB(BindProgramNV, 790, BindProgramNV@8)
-	GL_STUB(DeleteProgramsNV, 791, DeleteProgramsNV@8)
-	GL_STUB(ExecuteProgramNV, 792, ExecuteProgramNV@12)
-	GL_STUB(GenProgramsNV, 793, GenProgramsNV@8)
-	GL_STUB(GetProgramParameterdvNV, 794, GetProgramParameterdvNV@16)
-	GL_STUB(GetProgramParameterfvNV, 795, GetProgramParameterfvNV@16)
-	GL_STUB(GetProgramStringNV, 796, GetProgramStringNV@12)
-	GL_STUB(GetProgramivNV, 797, GetProgramivNV@12)
-	GL_STUB(GetTrackMatrixivNV, 798, GetTrackMatrixivNV@16)
-	GL_STUB(GetVertexAttribPointervNV, 799, GetVertexAttribPointervNV@12)
-	GL_STUB(GetVertexAttribdvNV, 800, GetVertexAttribdvNV@12)
-	GL_STUB(GetVertexAttribfvNV, 801, GetVertexAttribfvNV@12)
-	GL_STUB(GetVertexAttribivNV, 802, GetVertexAttribivNV@12)
-	GL_STUB(IsProgramNV, 803, IsProgramNV@4)
-	GL_STUB(LoadProgramNV, 804, LoadProgramNV@16)
-	GL_STUB(ProgramParameters4dvNV, 805, ProgramParameters4dvNV@16)
-	GL_STUB(ProgramParameters4fvNV, 806, ProgramParameters4fvNV@16)
-	GL_STUB(RequestResidentProgramsNV, 807, RequestResidentProgramsNV@8)
-	GL_STUB(TrackMatrixNV, 808, TrackMatrixNV@16)
-	GL_STUB(VertexAttrib1dNV, 809, VertexAttrib1dNV@12)
-	GL_STUB(VertexAttrib1dvNV, 810, VertexAttrib1dvNV@8)
-	GL_STUB(VertexAttrib1fNV, 811, VertexAttrib1fNV@8)
-	GL_STUB(VertexAttrib1fvNV, 812, VertexAttrib1fvNV@8)
-	GL_STUB(VertexAttrib1sNV, 813, VertexAttrib1sNV@8)
-	GL_STUB(VertexAttrib1svNV, 814, VertexAttrib1svNV@8)
-	GL_STUB(VertexAttrib2dNV, 815, VertexAttrib2dNV@20)
-	GL_STUB(VertexAttrib2dvNV, 816, VertexAttrib2dvNV@8)
-	GL_STUB(VertexAttrib2fNV, 817, VertexAttrib2fNV@12)
-	GL_STUB(VertexAttrib2fvNV, 818, VertexAttrib2fvNV@8)
-	GL_STUB(VertexAttrib2sNV, 819, VertexAttrib2sNV@12)
-	GL_STUB(VertexAttrib2svNV, 820, VertexAttrib2svNV@8)
-	GL_STUB(VertexAttrib3dNV, 821, VertexAttrib3dNV@28)
-	GL_STUB(VertexAttrib3dvNV, 822, VertexAttrib3dvNV@8)
-	GL_STUB(VertexAttrib3fNV, 823, VertexAttrib3fNV@16)
-	GL_STUB(VertexAttrib3fvNV, 824, VertexAttrib3fvNV@8)
-	GL_STUB(VertexAttrib3sNV, 825, VertexAttrib3sNV@16)
-	GL_STUB(VertexAttrib3svNV, 826, VertexAttrib3svNV@8)
-	GL_STUB(VertexAttrib4dNV, 827, VertexAttrib4dNV@36)
-	GL_STUB(VertexAttrib4dvNV, 828, VertexAttrib4dvNV@8)
-	GL_STUB(VertexAttrib4fNV, 829, VertexAttrib4fNV@20)
-	GL_STUB(VertexAttrib4fvNV, 830, VertexAttrib4fvNV@8)
-	GL_STUB(VertexAttrib4sNV, 831, VertexAttrib4sNV@20)
-	GL_STUB(VertexAttrib4svNV, 832, VertexAttrib4svNV@8)
-	GL_STUB(VertexAttrib4ubNV, 833, VertexAttrib4ubNV@20)
-	GL_STUB(VertexAttrib4ubvNV, 834, VertexAttrib4ubvNV@8)
-	GL_STUB(VertexAttribPointerNV, 835, VertexAttribPointerNV@20)
-	GL_STUB(VertexAttribs1dvNV, 836, VertexAttribs1dvNV@12)
-	GL_STUB(VertexAttribs1fvNV, 837, VertexAttribs1fvNV@12)
-	GL_STUB(VertexAttribs1svNV, 838, VertexAttribs1svNV@12)
-	GL_STUB(VertexAttribs2dvNV, 839, VertexAttribs2dvNV@12)
-	GL_STUB(VertexAttribs2fvNV, 840, VertexAttribs2fvNV@12)
-	GL_STUB(VertexAttribs2svNV, 841, VertexAttribs2svNV@12)
-	GL_STUB(VertexAttribs3dvNV, 842, VertexAttribs3dvNV@12)
-	GL_STUB(VertexAttribs3fvNV, 843, VertexAttribs3fvNV@12)
-	GL_STUB(VertexAttribs3svNV, 844, VertexAttribs3svNV@12)
-	GL_STUB(VertexAttribs4dvNV, 845, VertexAttribs4dvNV@12)
-	GL_STUB(VertexAttribs4fvNV, 846, VertexAttribs4fvNV@12)
-	GL_STUB(VertexAttribs4svNV, 847, VertexAttribs4svNV@12)
-	GL_STUB(VertexAttribs4ubvNV, 848, VertexAttribs4ubvNV@12)
-	GL_STUB(GetTexBumpParameterfvATI, 849, GetTexBumpParameterfvATI@8)
-	GL_STUB(GetTexBumpParameterivATI, 850, GetTexBumpParameterivATI@8)
-	GL_STUB(TexBumpParameterfvATI, 851, TexBumpParameterfvATI@8)
-	GL_STUB(TexBumpParameterivATI, 852, TexBumpParameterivATI@8)
-	GL_STUB(AlphaFragmentOp1ATI, 853, AlphaFragmentOp1ATI@24)
-	GL_STUB(AlphaFragmentOp2ATI, 854, AlphaFragmentOp2ATI@36)
-	GL_STUB(AlphaFragmentOp3ATI, 855, AlphaFragmentOp3ATI@48)
-	GL_STUB(BeginFragmentShaderATI, 856, BeginFragmentShaderATI@0)
-	GL_STUB(BindFragmentShaderATI, 857, BindFragmentShaderATI@4)
-	GL_STUB(ColorFragmentOp1ATI, 858, ColorFragmentOp1ATI@28)
-	GL_STUB(ColorFragmentOp2ATI, 859, ColorFragmentOp2ATI@40)
-	GL_STUB(ColorFragmentOp3ATI, 860, ColorFragmentOp3ATI@52)
-	GL_STUB(DeleteFragmentShaderATI, 861, DeleteFragmentShaderATI@4)
-	GL_STUB(EndFragmentShaderATI, 862, EndFragmentShaderATI@0)
-	GL_STUB(GenFragmentShadersATI, 863, GenFragmentShadersATI@4)
-	GL_STUB(PassTexCoordATI, 864, PassTexCoordATI@12)
-	GL_STUB(SampleMapATI, 865, SampleMapATI@12)
-	GL_STUB(SetFragmentShaderConstantATI, 866, SetFragmentShaderConstantATI@8)
-	GL_STUB(PointParameteriNV, 867, PointParameteriNV@8)
-	GL_STUB(PointParameterivNV, 868, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_869, 869, _dispatch_stub_869@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_869, _dispatch_stub_869@4))
-	GL_STUB(_dispatch_stub_870, 870, _dispatch_stub_870@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_870, _dispatch_stub_870@4))
-	GL_STUB(_dispatch_stub_871, 871, _dispatch_stub_871@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_871, _dispatch_stub_871@8))
-	GL_STUB(_dispatch_stub_872, 872, _dispatch_stub_872@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_872, _dispatch_stub_872@8))
-	GL_STUB(_dispatch_stub_873, 873, _dispatch_stub_873@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_873, _dispatch_stub_873@4))
-	GL_STUB(GetProgramNamedParameterdvNV, 874, GetProgramNamedParameterdvNV@16)
-	GL_STUB(GetProgramNamedParameterfvNV, 875, GetProgramNamedParameterfvNV@16)
-	GL_STUB(ProgramNamedParameter4dNV, 876, ProgramNamedParameter4dNV@44)
-	GL_STUB(ProgramNamedParameter4dvNV, 877, ProgramNamedParameter4dvNV@16)
-	GL_STUB(ProgramNamedParameter4fNV, 878, ProgramNamedParameter4fNV@28)
-	GL_STUB(ProgramNamedParameter4fvNV, 879, ProgramNamedParameter4fvNV@16)
-	GL_STUB(PrimitiveRestartIndexNV, 880, PrimitiveRestartIndexNV@4)
-	GL_STUB(PrimitiveRestartNV, 881, PrimitiveRestartNV@0)
-	GL_STUB(_dispatch_stub_882, 882, _dispatch_stub_882@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_882, _dispatch_stub_882@16))
-	GL_STUB(_dispatch_stub_883, 883, _dispatch_stub_883@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_883, _dispatch_stub_883@8))
-	GL_STUB(BindFramebufferEXT, 884, BindFramebufferEXT@8)
-	GL_STUB(BindRenderbufferEXT, 885, BindRenderbufferEXT@8)
-	GL_STUB(CheckFramebufferStatusEXT, 886, CheckFramebufferStatusEXT@4)
-	GL_STUB(DeleteFramebuffersEXT, 887, DeleteFramebuffersEXT@8)
-	GL_STUB(DeleteRenderbuffersEXT, 888, DeleteRenderbuffersEXT@8)
-	GL_STUB(FramebufferRenderbufferEXT, 889, FramebufferRenderbufferEXT@16)
-	GL_STUB(FramebufferTexture1DEXT, 890, FramebufferTexture1DEXT@20)
-	GL_STUB(FramebufferTexture2DEXT, 891, FramebufferTexture2DEXT@20)
-	GL_STUB(FramebufferTexture3DEXT, 892, FramebufferTexture3DEXT@24)
-	GL_STUB(GenFramebuffersEXT, 893, GenFramebuffersEXT@8)
-	GL_STUB(GenRenderbuffersEXT, 894, GenRenderbuffersEXT@8)
-	GL_STUB(GenerateMipmapEXT, 895, GenerateMipmapEXT@4)
-	GL_STUB(GetFramebufferAttachmentParameterivEXT, 896, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB(GetRenderbufferParameterivEXT, 897, GetRenderbufferParameterivEXT@12)
-	GL_STUB(IsFramebufferEXT, 898, IsFramebufferEXT@4)
-	GL_STUB(IsRenderbufferEXT, 899, IsRenderbufferEXT@4)
-	GL_STUB(RenderbufferStorageEXT, 900, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_901, 901, _dispatch_stub_901@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_901, _dispatch_stub_901@40))
-	GL_STUB(_dispatch_stub_902, 902, _dispatch_stub_902@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_902, _dispatch_stub_902@12))
-	GL_STUB(_dispatch_stub_903, 903, _dispatch_stub_903@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_903, _dispatch_stub_903@12))
-	GL_STUB(BindFragDataLocationEXT, 904, BindFragDataLocationEXT@12)
-	GL_STUB(GetFragDataLocationEXT, 905, GetFragDataLocationEXT@8)
-	GL_STUB(GetUniformuivEXT, 906, GetUniformuivEXT@12)
-	GL_STUB(GetVertexAttribIivEXT, 907, GetVertexAttribIivEXT@12)
-	GL_STUB(GetVertexAttribIuivEXT, 908, GetVertexAttribIuivEXT@12)
-	GL_STUB(Uniform1uiEXT, 909, Uniform1uiEXT@8)
-	GL_STUB(Uniform1uivEXT, 910, Uniform1uivEXT@12)
-	GL_STUB(Uniform2uiEXT, 911, Uniform2uiEXT@12)
-	GL_STUB(Uniform2uivEXT, 912, Uniform2uivEXT@12)
-	GL_STUB(Uniform3uiEXT, 913, Uniform3uiEXT@16)
-	GL_STUB(Uniform3uivEXT, 914, Uniform3uivEXT@12)
-	GL_STUB(Uniform4uiEXT, 915, Uniform4uiEXT@20)
-	GL_STUB(Uniform4uivEXT, 916, Uniform4uivEXT@12)
-	GL_STUB(VertexAttribI1iEXT, 917, VertexAttribI1iEXT@8)
-	GL_STUB(VertexAttribI1ivEXT, 918, VertexAttribI1ivEXT@8)
-	GL_STUB(VertexAttribI1uiEXT, 919, VertexAttribI1uiEXT@8)
-	GL_STUB(VertexAttribI1uivEXT, 920, VertexAttribI1uivEXT@8)
-	GL_STUB(VertexAttribI2iEXT, 921, VertexAttribI2iEXT@12)
-	GL_STUB(VertexAttribI2ivEXT, 922, VertexAttribI2ivEXT@8)
-	GL_STUB(VertexAttribI2uiEXT, 923, VertexAttribI2uiEXT@12)
-	GL_STUB(VertexAttribI2uivEXT, 924, VertexAttribI2uivEXT@8)
-	GL_STUB(VertexAttribI3iEXT, 925, VertexAttribI3iEXT@16)
-	GL_STUB(VertexAttribI3ivEXT, 926, VertexAttribI3ivEXT@8)
-	GL_STUB(VertexAttribI3uiEXT, 927, VertexAttribI3uiEXT@16)
-	GL_STUB(VertexAttribI3uivEXT, 928, VertexAttribI3uivEXT@8)
-	GL_STUB(VertexAttribI4bvEXT, 929, VertexAttribI4bvEXT@8)
-	GL_STUB(VertexAttribI4iEXT, 930, VertexAttribI4iEXT@20)
-	GL_STUB(VertexAttribI4ivEXT, 931, VertexAttribI4ivEXT@8)
-	GL_STUB(VertexAttribI4svEXT, 932, VertexAttribI4svEXT@8)
-	GL_STUB(VertexAttribI4ubvEXT, 933, VertexAttribI4ubvEXT@8)
-	GL_STUB(VertexAttribI4uiEXT, 934, VertexAttribI4uiEXT@20)
-	GL_STUB(VertexAttribI4uivEXT, 935, VertexAttribI4uivEXT@8)
-	GL_STUB(VertexAttribI4usvEXT, 936, VertexAttribI4usvEXT@8)
-	GL_STUB(VertexAttribIPointerEXT, 937, VertexAttribIPointerEXT@20)
-	GL_STUB(FramebufferTextureLayerEXT, 938, FramebufferTextureLayerEXT@20)
-	GL_STUB(ColorMaskIndexedEXT, 939, ColorMaskIndexedEXT@20)
-	GL_STUB(DisableIndexedEXT, 940, DisableIndexedEXT@8)
-	GL_STUB(EnableIndexedEXT, 941, EnableIndexedEXT@8)
-	GL_STUB(GetBooleanIndexedvEXT, 942, GetBooleanIndexedvEXT@12)
-	GL_STUB(GetIntegerIndexedvEXT, 943, GetIntegerIndexedvEXT@12)
-	GL_STUB(IsEnabledIndexedEXT, 944, IsEnabledIndexedEXT@8)
-	GL_STUB(ClearColorIiEXT, 945, ClearColorIiEXT@16)
-	GL_STUB(ClearColorIuiEXT, 946, ClearColorIuiEXT@16)
-	GL_STUB(GetTexParameterIivEXT, 947, GetTexParameterIivEXT@12)
-	GL_STUB(GetTexParameterIuivEXT, 948, GetTexParameterIuivEXT@12)
-	GL_STUB(TexParameterIivEXT, 949, TexParameterIivEXT@12)
-	GL_STUB(TexParameterIuivEXT, 950, TexParameterIuivEXT@12)
-	GL_STUB(BeginConditionalRenderNV, 951, BeginConditionalRenderNV@8)
-	GL_STUB(EndConditionalRenderNV, 952, EndConditionalRenderNV@0)
-	GL_STUB(BeginTransformFeedbackEXT, 953, BeginTransformFeedbackEXT@4)
-	GL_STUB(BindBufferBaseEXT, 954, BindBufferBaseEXT@12)
-	GL_STUB(BindBufferOffsetEXT, 955, BindBufferOffsetEXT@16)
-	GL_STUB(BindBufferRangeEXT, 956, BindBufferRangeEXT@20)
-	GL_STUB(EndTransformFeedbackEXT, 957, EndTransformFeedbackEXT@0)
-	GL_STUB(GetTransformFeedbackVaryingEXT, 958, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB(TransformFeedbackVaryingsEXT, 959, TransformFeedbackVaryingsEXT@16)
-	GL_STUB(ProvokingVertexEXT, 960, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_961, 961, _dispatch_stub_961@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_961, _dispatch_stub_961@12))
-	GL_STUB(_dispatch_stub_962, 962, _dispatch_stub_962@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_962, _dispatch_stub_962@12))
-	GL_STUB(GetObjectParameterivAPPLE, 963, GetObjectParameterivAPPLE@16)
-	GL_STUB(ObjectPurgeableAPPLE, 964, ObjectPurgeableAPPLE@12)
-	GL_STUB(ObjectUnpurgeableAPPLE, 965, ObjectUnpurgeableAPPLE@12)
-	GL_STUB(ActiveProgramEXT, 966, ActiveProgramEXT@4)
-	GL_STUB(CreateShaderProgramEXT, 967, CreateShaderProgramEXT@8)
-	GL_STUB(UseShaderProgramEXT, 968, UseShaderProgramEXT@8)
-	GL_STUB(TextureBarrierNV, 969, TextureBarrierNV@0)
-	GL_STUB(_dispatch_stub_970, 970, _dispatch_stub_970@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_970, _dispatch_stub_970@16))
-	GL_STUB(_dispatch_stub_971, 971, _dispatch_stub_971@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_971, _dispatch_stub_971@16))
+	GL_STUB(_dispatch_stub_789, 789, _dispatch_stub_789@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@8))
+	GL_STUB(_dispatch_stub_790, 790, _dispatch_stub_790@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@4))
+	GL_STUB(AreProgramsResidentNV, 791, AreProgramsResidentNV@12)
+	GL_STUB(BindProgramNV, 792, BindProgramNV@8)
+	GL_STUB(DeleteProgramsNV, 793, DeleteProgramsNV@8)
+	GL_STUB(ExecuteProgramNV, 794, ExecuteProgramNV@12)
+	GL_STUB(GenProgramsNV, 795, GenProgramsNV@8)
+	GL_STUB(GetProgramParameterdvNV, 796, GetProgramParameterdvNV@16)
+	GL_STUB(GetProgramParameterfvNV, 797, GetProgramParameterfvNV@16)
+	GL_STUB(GetProgramStringNV, 798, GetProgramStringNV@12)
+	GL_STUB(GetProgramivNV, 799, GetProgramivNV@12)
+	GL_STUB(GetTrackMatrixivNV, 800, GetTrackMatrixivNV@16)
+	GL_STUB(GetVertexAttribPointervNV, 801, GetVertexAttribPointervNV@12)
+	GL_STUB(GetVertexAttribdvNV, 802, GetVertexAttribdvNV@12)
+	GL_STUB(GetVertexAttribfvNV, 803, GetVertexAttribfvNV@12)
+	GL_STUB(GetVertexAttribivNV, 804, GetVertexAttribivNV@12)
+	GL_STUB(IsProgramNV, 805, IsProgramNV@4)
+	GL_STUB(LoadProgramNV, 806, LoadProgramNV@16)
+	GL_STUB(ProgramParameters4dvNV, 807, ProgramParameters4dvNV@16)
+	GL_STUB(ProgramParameters4fvNV, 808, ProgramParameters4fvNV@16)
+	GL_STUB(RequestResidentProgramsNV, 809, RequestResidentProgramsNV@8)
+	GL_STUB(TrackMatrixNV, 810, TrackMatrixNV@16)
+	GL_STUB(VertexAttrib1dNV, 811, VertexAttrib1dNV@12)
+	GL_STUB(VertexAttrib1dvNV, 812, VertexAttrib1dvNV@8)
+	GL_STUB(VertexAttrib1fNV, 813, VertexAttrib1fNV@8)
+	GL_STUB(VertexAttrib1fvNV, 814, VertexAttrib1fvNV@8)
+	GL_STUB(VertexAttrib1sNV, 815, VertexAttrib1sNV@8)
+	GL_STUB(VertexAttrib1svNV, 816, VertexAttrib1svNV@8)
+	GL_STUB(VertexAttrib2dNV, 817, VertexAttrib2dNV@20)
+	GL_STUB(VertexAttrib2dvNV, 818, VertexAttrib2dvNV@8)
+	GL_STUB(VertexAttrib2fNV, 819, VertexAttrib2fNV@12)
+	GL_STUB(VertexAttrib2fvNV, 820, VertexAttrib2fvNV@8)
+	GL_STUB(VertexAttrib2sNV, 821, VertexAttrib2sNV@12)
+	GL_STUB(VertexAttrib2svNV, 822, VertexAttrib2svNV@8)
+	GL_STUB(VertexAttrib3dNV, 823, VertexAttrib3dNV@28)
+	GL_STUB(VertexAttrib3dvNV, 824, VertexAttrib3dvNV@8)
+	GL_STUB(VertexAttrib3fNV, 825, VertexAttrib3fNV@16)
+	GL_STUB(VertexAttrib3fvNV, 826, VertexAttrib3fvNV@8)
+	GL_STUB(VertexAttrib3sNV, 827, VertexAttrib3sNV@16)
+	GL_STUB(VertexAttrib3svNV, 828, VertexAttrib3svNV@8)
+	GL_STUB(VertexAttrib4dNV, 829, VertexAttrib4dNV@36)
+	GL_STUB(VertexAttrib4dvNV, 830, VertexAttrib4dvNV@8)
+	GL_STUB(VertexAttrib4fNV, 831, VertexAttrib4fNV@20)
+	GL_STUB(VertexAttrib4fvNV, 832, VertexAttrib4fvNV@8)
+	GL_STUB(VertexAttrib4sNV, 833, VertexAttrib4sNV@20)
+	GL_STUB(VertexAttrib4svNV, 834, VertexAttrib4svNV@8)
+	GL_STUB(VertexAttrib4ubNV, 835, VertexAttrib4ubNV@20)
+	GL_STUB(VertexAttrib4ubvNV, 836, VertexAttrib4ubvNV@8)
+	GL_STUB(VertexAttribPointerNV, 837, VertexAttribPointerNV@20)
+	GL_STUB(VertexAttribs1dvNV, 838, VertexAttribs1dvNV@12)
+	GL_STUB(VertexAttribs1fvNV, 839, VertexAttribs1fvNV@12)
+	GL_STUB(VertexAttribs1svNV, 840, VertexAttribs1svNV@12)
+	GL_STUB(VertexAttribs2dvNV, 841, VertexAttribs2dvNV@12)
+	GL_STUB(VertexAttribs2fvNV, 842, VertexAttribs2fvNV@12)
+	GL_STUB(VertexAttribs2svNV, 843, VertexAttribs2svNV@12)
+	GL_STUB(VertexAttribs3dvNV, 844, VertexAttribs3dvNV@12)
+	GL_STUB(VertexAttribs3fvNV, 845, VertexAttribs3fvNV@12)
+	GL_STUB(VertexAttribs3svNV, 846, VertexAttribs3svNV@12)
+	GL_STUB(VertexAttribs4dvNV, 847, VertexAttribs4dvNV@12)
+	GL_STUB(VertexAttribs4fvNV, 848, VertexAttribs4fvNV@12)
+	GL_STUB(VertexAttribs4svNV, 849, VertexAttribs4svNV@12)
+	GL_STUB(VertexAttribs4ubvNV, 850, VertexAttribs4ubvNV@12)
+	GL_STUB(GetTexBumpParameterfvATI, 851, GetTexBumpParameterfvATI@8)
+	GL_STUB(GetTexBumpParameterivATI, 852, GetTexBumpParameterivATI@8)
+	GL_STUB(TexBumpParameterfvATI, 853, TexBumpParameterfvATI@8)
+	GL_STUB(TexBumpParameterivATI, 854, TexBumpParameterivATI@8)
+	GL_STUB(AlphaFragmentOp1ATI, 855, AlphaFragmentOp1ATI@24)
+	GL_STUB(AlphaFragmentOp2ATI, 856, AlphaFragmentOp2ATI@36)
+	GL_STUB(AlphaFragmentOp3ATI, 857, AlphaFragmentOp3ATI@48)
+	GL_STUB(BeginFragmentShaderATI, 858, BeginFragmentShaderATI@0)
+	GL_STUB(BindFragmentShaderATI, 859, BindFragmentShaderATI@4)
+	GL_STUB(ColorFragmentOp1ATI, 860, ColorFragmentOp1ATI@28)
+	GL_STUB(ColorFragmentOp2ATI, 861, ColorFragmentOp2ATI@40)
+	GL_STUB(ColorFragmentOp3ATI, 862, ColorFragmentOp3ATI@52)
+	GL_STUB(DeleteFragmentShaderATI, 863, DeleteFragmentShaderATI@4)
+	GL_STUB(EndFragmentShaderATI, 864, EndFragmentShaderATI@0)
+	GL_STUB(GenFragmentShadersATI, 865, GenFragmentShadersATI@4)
+	GL_STUB(PassTexCoordATI, 866, PassTexCoordATI@12)
+	GL_STUB(SampleMapATI, 867, SampleMapATI@12)
+	GL_STUB(SetFragmentShaderConstantATI, 868, SetFragmentShaderConstantATI@8)
+	GL_STUB(PointParameteriNV, 869, PointParameteriNV@8)
+	GL_STUB(PointParameterivNV, 870, PointParameterivNV@8)
+	GL_STUB(_dispatch_stub_871, 871, _dispatch_stub_871@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_871, _dispatch_stub_871@4))
+	GL_STUB(_dispatch_stub_872, 872, _dispatch_stub_872@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_872, _dispatch_stub_872@4))
+	GL_STUB(_dispatch_stub_873, 873, _dispatch_stub_873@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_873, _dispatch_stub_873@8))
+	GL_STUB(_dispatch_stub_874, 874, _dispatch_stub_874@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_874, _dispatch_stub_874@8))
+	GL_STUB(_dispatch_stub_875, 875, _dispatch_stub_875@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_875, _dispatch_stub_875@4))
+	GL_STUB(GetProgramNamedParameterdvNV, 876, GetProgramNamedParameterdvNV@16)
+	GL_STUB(GetProgramNamedParameterfvNV, 877, GetProgramNamedParameterfvNV@16)
+	GL_STUB(ProgramNamedParameter4dNV, 878, ProgramNamedParameter4dNV@44)
+	GL_STUB(ProgramNamedParameter4dvNV, 879, ProgramNamedParameter4dvNV@16)
+	GL_STUB(ProgramNamedParameter4fNV, 880, ProgramNamedParameter4fNV@28)
+	GL_STUB(ProgramNamedParameter4fvNV, 881, ProgramNamedParameter4fvNV@16)
+	GL_STUB(PrimitiveRestartIndexNV, 882, PrimitiveRestartIndexNV@4)
+	GL_STUB(PrimitiveRestartNV, 883, PrimitiveRestartNV@0)
+	GL_STUB(_dispatch_stub_884, 884, _dispatch_stub_884@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_884, _dispatch_stub_884@16))
+	GL_STUB(_dispatch_stub_885, 885, _dispatch_stub_885@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_885, _dispatch_stub_885@8))
+	GL_STUB(BindFramebufferEXT, 886, BindFramebufferEXT@8)
+	GL_STUB(BindRenderbufferEXT, 887, BindRenderbufferEXT@8)
+	GL_STUB(CheckFramebufferStatusEXT, 888, CheckFramebufferStatusEXT@4)
+	GL_STUB(DeleteFramebuffersEXT, 889, DeleteFramebuffersEXT@8)
+	GL_STUB(DeleteRenderbuffersEXT, 890, DeleteRenderbuffersEXT@8)
+	GL_STUB(FramebufferRenderbufferEXT, 891, FramebufferRenderbufferEXT@16)
+	GL_STUB(FramebufferTexture1DEXT, 892, FramebufferTexture1DEXT@20)
+	GL_STUB(FramebufferTexture2DEXT, 893, FramebufferTexture2DEXT@20)
+	GL_STUB(FramebufferTexture3DEXT, 894, FramebufferTexture3DEXT@24)
+	GL_STUB(GenFramebuffersEXT, 895, GenFramebuffersEXT@8)
+	GL_STUB(GenRenderbuffersEXT, 896, GenRenderbuffersEXT@8)
+	GL_STUB(GenerateMipmapEXT, 897, GenerateMipmapEXT@4)
+	GL_STUB(GetFramebufferAttachmentParameterivEXT, 898, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB(GetRenderbufferParameterivEXT, 899, GetRenderbufferParameterivEXT@12)
+	GL_STUB(IsFramebufferEXT, 900, IsFramebufferEXT@4)
+	GL_STUB(IsRenderbufferEXT, 901, IsRenderbufferEXT@4)
+	GL_STUB(RenderbufferStorageEXT, 902, RenderbufferStorageEXT@16)
+	GL_STUB(_dispatch_stub_903, 903, _dispatch_stub_903@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_903, _dispatch_stub_903@40))
+	GL_STUB(_dispatch_stub_904, 904, _dispatch_stub_904@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_904, _dispatch_stub_904@12))
+	GL_STUB(_dispatch_stub_905, 905, _dispatch_stub_905@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_905, _dispatch_stub_905@12))
+	GL_STUB(BindFragDataLocationEXT, 906, BindFragDataLocationEXT@12)
+	GL_STUB(GetFragDataLocationEXT, 907, GetFragDataLocationEXT@8)
+	GL_STUB(GetUniformuivEXT, 908, GetUniformuivEXT@12)
+	GL_STUB(GetVertexAttribIivEXT, 909, GetVertexAttribIivEXT@12)
+	GL_STUB(GetVertexAttribIuivEXT, 910, GetVertexAttribIuivEXT@12)
+	GL_STUB(Uniform1uiEXT, 911, Uniform1uiEXT@8)
+	GL_STUB(Uniform1uivEXT, 912, Uniform1uivEXT@12)
+	GL_STUB(Uniform2uiEXT, 913, Uniform2uiEXT@12)
+	GL_STUB(Uniform2uivEXT, 914, Uniform2uivEXT@12)
+	GL_STUB(Uniform3uiEXT, 915, Uniform3uiEXT@16)
+	GL_STUB(Uniform3uivEXT, 916, Uniform3uivEXT@12)
+	GL_STUB(Uniform4uiEXT, 917, Uniform4uiEXT@20)
+	GL_STUB(Uniform4uivEXT, 918, Uniform4uivEXT@12)
+	GL_STUB(VertexAttribI1iEXT, 919, VertexAttribI1iEXT@8)
+	GL_STUB(VertexAttribI1ivEXT, 920, VertexAttribI1ivEXT@8)
+	GL_STUB(VertexAttribI1uiEXT, 921, VertexAttribI1uiEXT@8)
+	GL_STUB(VertexAttribI1uivEXT, 922, VertexAttribI1uivEXT@8)
+	GL_STUB(VertexAttribI2iEXT, 923, VertexAttribI2iEXT@12)
+	GL_STUB(VertexAttribI2ivEXT, 924, VertexAttribI2ivEXT@8)
+	GL_STUB(VertexAttribI2uiEXT, 925, VertexAttribI2uiEXT@12)
+	GL_STUB(VertexAttribI2uivEXT, 926, VertexAttribI2uivEXT@8)
+	GL_STUB(VertexAttribI3iEXT, 927, VertexAttribI3iEXT@16)
+	GL_STUB(VertexAttribI3ivEXT, 928, VertexAttribI3ivEXT@8)
+	GL_STUB(VertexAttribI3uiEXT, 929, VertexAttribI3uiEXT@16)
+	GL_STUB(VertexAttribI3uivEXT, 930, VertexAttribI3uivEXT@8)
+	GL_STUB(VertexAttribI4bvEXT, 931, VertexAttribI4bvEXT@8)
+	GL_STUB(VertexAttribI4iEXT, 932, VertexAttribI4iEXT@20)
+	GL_STUB(VertexAttribI4ivEXT, 933, VertexAttribI4ivEXT@8)
+	GL_STUB(VertexAttribI4svEXT, 934, VertexAttribI4svEXT@8)
+	GL_STUB(VertexAttribI4ubvEXT, 935, VertexAttribI4ubvEXT@8)
+	GL_STUB(VertexAttribI4uiEXT, 936, VertexAttribI4uiEXT@20)
+	GL_STUB(VertexAttribI4uivEXT, 937, VertexAttribI4uivEXT@8)
+	GL_STUB(VertexAttribI4usvEXT, 938, VertexAttribI4usvEXT@8)
+	GL_STUB(VertexAttribIPointerEXT, 939, VertexAttribIPointerEXT@20)
+	GL_STUB(FramebufferTextureLayerEXT, 940, FramebufferTextureLayerEXT@20)
+	GL_STUB(ColorMaskIndexedEXT, 941, ColorMaskIndexedEXT@20)
+	GL_STUB(DisableIndexedEXT, 942, DisableIndexedEXT@8)
+	GL_STUB(EnableIndexedEXT, 943, EnableIndexedEXT@8)
+	GL_STUB(GetBooleanIndexedvEXT, 944, GetBooleanIndexedvEXT@12)
+	GL_STUB(GetIntegerIndexedvEXT, 945, GetIntegerIndexedvEXT@12)
+	GL_STUB(IsEnabledIndexedEXT, 946, IsEnabledIndexedEXT@8)
+	GL_STUB(ClearColorIiEXT, 947, ClearColorIiEXT@16)
+	GL_STUB(ClearColorIuiEXT, 948, ClearColorIuiEXT@16)
+	GL_STUB(GetTexParameterIivEXT, 949, GetTexParameterIivEXT@12)
+	GL_STUB(GetTexParameterIuivEXT, 950, GetTexParameterIuivEXT@12)
+	GL_STUB(TexParameterIivEXT, 951, TexParameterIivEXT@12)
+	GL_STUB(TexParameterIuivEXT, 952, TexParameterIuivEXT@12)
+	GL_STUB(BeginConditionalRenderNV, 953, BeginConditionalRenderNV@8)
+	GL_STUB(EndConditionalRenderNV, 954, EndConditionalRenderNV@0)
+	GL_STUB(BeginTransformFeedbackEXT, 955, BeginTransformFeedbackEXT@4)
+	GL_STUB(BindBufferBaseEXT, 956, BindBufferBaseEXT@12)
+	GL_STUB(BindBufferOffsetEXT, 957, BindBufferOffsetEXT@16)
+	GL_STUB(BindBufferRangeEXT, 958, BindBufferRangeEXT@20)
+	GL_STUB(EndTransformFeedbackEXT, 959, EndTransformFeedbackEXT@0)
+	GL_STUB(GetTransformFeedbackVaryingEXT, 960, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB(TransformFeedbackVaryingsEXT, 961, TransformFeedbackVaryingsEXT@16)
+	GL_STUB(ProvokingVertexEXT, 962, ProvokingVertexEXT@4)
+	GL_STUB(_dispatch_stub_963, 963, _dispatch_stub_963@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_963, _dispatch_stub_963@12))
+	GL_STUB(_dispatch_stub_964, 964, _dispatch_stub_964@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_964, _dispatch_stub_964@12))
+	GL_STUB(GetObjectParameterivAPPLE, 965, GetObjectParameterivAPPLE@16)
+	GL_STUB(ObjectPurgeableAPPLE, 966, ObjectPurgeableAPPLE@12)
+	GL_STUB(ObjectUnpurgeableAPPLE, 967, ObjectUnpurgeableAPPLE@12)
+	GL_STUB(ActiveProgramEXT, 968, ActiveProgramEXT@4)
+	GL_STUB(CreateShaderProgramEXT, 969, CreateShaderProgramEXT@8)
+	GL_STUB(UseShaderProgramEXT, 970, UseShaderProgramEXT@8)
+	GL_STUB(TextureBarrierNV, 971, TextureBarrierNV@0)
 	GL_STUB(_dispatch_stub_972, 972, _dispatch_stub_972@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_972, _dispatch_stub_972@16))
-	GL_STUB(_dispatch_stub_973, 973, _dispatch_stub_973@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_973, _dispatch_stub_973@12))
-	GL_STUB(_dispatch_stub_974, 974, _dispatch_stub_974@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_974, _dispatch_stub_974@12))
-	GL_STUB(EGLImageTargetRenderbufferStorageOES, 975, EGLImageTargetRenderbufferStorageOES@8)
-	GL_STUB(EGLImageTargetTexture2DOES, 976, EGLImageTargetTexture2DOES@8)
+	GL_STUB(_dispatch_stub_973, 973, _dispatch_stub_973@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_973, _dispatch_stub_973@16))
+	GL_STUB(_dispatch_stub_974, 974, _dispatch_stub_974@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_974, _dispatch_stub_974@16))
+	GL_STUB(_dispatch_stub_975, 975, _dispatch_stub_975@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_975, _dispatch_stub_975@12))
+	GL_STUB(_dispatch_stub_976, 976, _dispatch_stub_976@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_976, _dispatch_stub_976@12))
+	GL_STUB(EGLImageTargetRenderbufferStorageOES, 977, EGLImageTargetRenderbufferStorageOES@8)
+	GL_STUB(EGLImageTargetTexture2DOES, 978, EGLImageTargetTexture2DOES@8)
 	GL_STUB_ALIAS(ArrayElementEXT, 306, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, 307, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, 310, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1356,152 +1358,152 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(BlendEquationIndexedAMD, 598, BlendEquationIndexedAMD@8, BlendEquationiARB, BlendEquationiARB@8)
 	GL_STUB_ALIAS(BlendFuncSeparateIndexedAMD, 599, BlendFuncSeparateIndexedAMD@20, BlendFuncSeparateiARB, BlendFuncSeparateiARB@20)
 	GL_STUB_ALIAS(BlendFuncIndexedAMD, 600, BlendFuncIndexedAMD@12, BlendFunciARB, BlendFunciARB@12)
-	GL_STUB_ALIAS(PointParameterf, 710, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfARB, 710, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfv, 711, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(PointParameterfvARB, 711, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(SecondaryColor3b, 714, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3bv, 715, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3d, 716, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
-	GL_STUB_ALIAS(SecondaryColor3dv, 717, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3f, 718, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3fv, 719, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3i, 720, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3iv, 721, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3s, 722, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3sv, 723, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ub, 724, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3ubv, 725, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ui, 726, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3uiv, 727, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3us, 728, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3usv, 729, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
-	GL_STUB_ALIAS(SecondaryColorPointer, 730, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
-	GL_STUB_ALIAS(MultiDrawArrays, 731, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
-	GL_STUB_ALIAS(MultiDrawElements, 732, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
-	GL_STUB_ALIAS(FogCoordPointer, 733, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
-	GL_STUB_ALIAS(FogCoordd, 734, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
-	GL_STUB_ALIAS(FogCoorddv, 735, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
-	GL_STUB_ALIAS(FogCoordf, 736, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
-	GL_STUB_ALIAS(FogCoordfv, 737, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB_ALIAS(BlendFuncSeparate, 739, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
-	GL_STUB_ALIAS(WindowPos2d, 756, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dARB, 756, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dv, 757, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2dvARB, 757, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2f, 758, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fARB, 758, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fv, 759, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2fvARB, 759, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2i, 760, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iARB, 760, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iv, 761, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2ivARB, 761, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2s, 762, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sARB, 762, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sv, 763, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos2svARB, 763, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos3d, 764, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dARB, 764, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dv, 765, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3dvARB, 765, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3f, 766, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fARB, 766, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fv, 767, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3fvARB, 767, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3i, 768, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iARB, 768, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iv, 769, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3ivARB, 769, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3s, 770, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sARB, 770, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sv, 771, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(WindowPos3svARB, 771, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(BindProgramARB, 790, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
-	GL_STUB_ALIAS(DeleteProgramsARB, 791, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
-	GL_STUB_ALIAS(GenProgramsARB, 793, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
-	GL_STUB_ALIAS(GetVertexAttribPointerv, 799, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(GetVertexAttribPointervARB, 799, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(IsProgramARB, 803, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
-	GL_STUB_ALIAS(PointParameteri, 867, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
-	GL_STUB_ALIAS(PointParameteriv, 868, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
-	GL_STUB_ALIAS(DeleteVertexArrays, 871, DeleteVertexArrays@8, _dispatch_stub_871, _dispatch_stub_871@8)
-	GL_STUB_ALIAS(IsVertexArray, 873, IsVertexArray@4, _dispatch_stub_873, _dispatch_stub_873@4)
-	GL_STUB_ALIAS(PrimitiveRestartIndex, 880, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
-	GL_STUB_ALIAS(BlendEquationSeparate, 883, BlendEquationSeparate@8, _dispatch_stub_883, _dispatch_stub_883@8)
-	GL_STUB_ALIAS(BindFramebuffer, 884, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
-	GL_STUB_ALIAS(BindRenderbuffer, 885, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
-	GL_STUB_ALIAS(CheckFramebufferStatus, 886, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
-	GL_STUB_ALIAS(DeleteFramebuffers, 887, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
-	GL_STUB_ALIAS(DeleteRenderbuffers, 888, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
-	GL_STUB_ALIAS(FramebufferRenderbuffer, 889, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
-	GL_STUB_ALIAS(FramebufferTexture1D, 890, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture2D, 891, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture3D, 892, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
-	GL_STUB_ALIAS(GenFramebuffers, 893, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
-	GL_STUB_ALIAS(GenRenderbuffers, 894, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
-	GL_STUB_ALIAS(GenerateMipmap, 895, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
-	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 896, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB_ALIAS(GetRenderbufferParameteriv, 897, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
-	GL_STUB_ALIAS(IsFramebuffer, 898, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
-	GL_STUB_ALIAS(IsRenderbuffer, 899, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
-	GL_STUB_ALIAS(RenderbufferStorage, 900, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB_ALIAS(BlitFramebuffer, 901, BlitFramebuffer@40, _dispatch_stub_901, _dispatch_stub_901@40)
-	GL_STUB_ALIAS(BindFragDataLocation, 904, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
-	GL_STUB_ALIAS(GetFragDataLocation, 905, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
-	GL_STUB_ALIAS(GetUniformuiv, 906, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIiv, 907, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIuiv, 908, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
-	GL_STUB_ALIAS(Uniform1ui, 909, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
-	GL_STUB_ALIAS(Uniform1uiv, 910, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
-	GL_STUB_ALIAS(Uniform2ui, 911, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
-	GL_STUB_ALIAS(Uniform2uiv, 912, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
-	GL_STUB_ALIAS(Uniform3ui, 913, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
-	GL_STUB_ALIAS(Uniform3uiv, 914, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
-	GL_STUB_ALIAS(Uniform4ui, 915, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
-	GL_STUB_ALIAS(Uniform4uiv, 916, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
-	GL_STUB_ALIAS(VertexAttribI1i, 917, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1iv, 918, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1ui, 919, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1uiv, 920, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2i, 921, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2iv, 922, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2ui, 923, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2uiv, 924, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3i, 925, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3iv, 926, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3ui, 927, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3uiv, 928, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4bv, 929, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4i, 930, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4iv, 931, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4sv, 932, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ubv, 933, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ui, 934, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4uiv, 935, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4usv, 936, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
-	GL_STUB_ALIAS(VertexAttribIPointer, 937, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayer, 938, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayerARB, 938, FramebufferTextureLayerARB@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(ColorMaski, 939, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
-	GL_STUB_ALIAS(Disablei, 940, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
-	GL_STUB_ALIAS(Enablei, 941, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
-	GL_STUB_ALIAS(GetBooleani_v, 942, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
-	GL_STUB_ALIAS(GetIntegeri_v, 943, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
-	GL_STUB_ALIAS(IsEnabledi, 944, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
-	GL_STUB_ALIAS(GetTexParameterIiv, 947, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
-	GL_STUB_ALIAS(GetTexParameterIuiv, 948, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
-	GL_STUB_ALIAS(TexParameterIiv, 949, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
-	GL_STUB_ALIAS(TexParameterIuiv, 950, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
-	GL_STUB_ALIAS(BeginConditionalRender, 951, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
-	GL_STUB_ALIAS(EndConditionalRender, 952, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
-	GL_STUB_ALIAS(BeginTransformFeedback, 953, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
-	GL_STUB_ALIAS(BindBufferBase, 954, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
-	GL_STUB_ALIAS(BindBufferRange, 956, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
-	GL_STUB_ALIAS(EndTransformFeedback, 957, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
-	GL_STUB_ALIAS(GetTransformFeedbackVarying, 958, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB_ALIAS(TransformFeedbackVaryings, 959, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
-	GL_STUB_ALIAS(ProvokingVertex, 960, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
+	GL_STUB_ALIAS(PointParameterf, 712, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfARB, 712, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfv, 713, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(PointParameterfvARB, 713, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(SecondaryColor3b, 716, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3bv, 717, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3d, 718, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
+	GL_STUB_ALIAS(SecondaryColor3dv, 719, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3f, 720, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3fv, 721, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3i, 722, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3iv, 723, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3s, 724, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3sv, 725, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ub, 726, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3ubv, 727, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ui, 728, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3uiv, 729, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3us, 730, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3usv, 731, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
+	GL_STUB_ALIAS(SecondaryColorPointer, 732, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
+	GL_STUB_ALIAS(MultiDrawArrays, 733, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
+	GL_STUB_ALIAS(MultiDrawElements, 734, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
+	GL_STUB_ALIAS(FogCoordPointer, 735, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
+	GL_STUB_ALIAS(FogCoordd, 736, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
+	GL_STUB_ALIAS(FogCoorddv, 737, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
+	GL_STUB_ALIAS(FogCoordf, 738, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
+	GL_STUB_ALIAS(FogCoordfv, 739, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
+	GL_STUB_ALIAS(BlendFuncSeparate, 741, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
+	GL_STUB_ALIAS(WindowPos2d, 758, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dARB, 758, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dv, 759, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2dvARB, 759, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2f, 760, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fARB, 760, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fv, 761, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2fvARB, 761, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2i, 762, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iARB, 762, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iv, 763, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2ivARB, 763, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2s, 764, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sARB, 764, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sv, 765, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos2svARB, 765, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos3d, 766, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dARB, 766, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dv, 767, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3dvARB, 767, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3f, 768, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fARB, 768, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fv, 769, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3fvARB, 769, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3i, 770, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iARB, 770, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iv, 771, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3ivARB, 771, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3s, 772, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sARB, 772, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sv, 773, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(WindowPos3svARB, 773, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(BindProgramARB, 792, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
+	GL_STUB_ALIAS(DeleteProgramsARB, 793, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
+	GL_STUB_ALIAS(GenProgramsARB, 795, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
+	GL_STUB_ALIAS(GetVertexAttribPointerv, 801, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(GetVertexAttribPointervARB, 801, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(IsProgramARB, 805, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
+	GL_STUB_ALIAS(PointParameteri, 869, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
+	GL_STUB_ALIAS(PointParameteriv, 870, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
+	GL_STUB_ALIAS(DeleteVertexArrays, 873, DeleteVertexArrays@8, _dispatch_stub_873, _dispatch_stub_873@8)
+	GL_STUB_ALIAS(IsVertexArray, 875, IsVertexArray@4, _dispatch_stub_875, _dispatch_stub_875@4)
+	GL_STUB_ALIAS(PrimitiveRestartIndex, 882, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
+	GL_STUB_ALIAS(BlendEquationSeparate, 885, BlendEquationSeparate@8, _dispatch_stub_885, _dispatch_stub_885@8)
+	GL_STUB_ALIAS(BindFramebuffer, 886, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
+	GL_STUB_ALIAS(BindRenderbuffer, 887, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
+	GL_STUB_ALIAS(CheckFramebufferStatus, 888, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
+	GL_STUB_ALIAS(DeleteFramebuffers, 889, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
+	GL_STUB_ALIAS(DeleteRenderbuffers, 890, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
+	GL_STUB_ALIAS(FramebufferRenderbuffer, 891, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
+	GL_STUB_ALIAS(FramebufferTexture1D, 892, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture2D, 893, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture3D, 894, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
+	GL_STUB_ALIAS(GenFramebuffers, 895, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
+	GL_STUB_ALIAS(GenRenderbuffers, 896, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
+	GL_STUB_ALIAS(GenerateMipmap, 897, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
+	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 898, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB_ALIAS(GetRenderbufferParameteriv, 899, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
+	GL_STUB_ALIAS(IsFramebuffer, 900, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
+	GL_STUB_ALIAS(IsRenderbuffer, 901, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
+	GL_STUB_ALIAS(RenderbufferStorage, 902, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
+	GL_STUB_ALIAS(BlitFramebuffer, 903, BlitFramebuffer@40, _dispatch_stub_903, _dispatch_stub_903@40)
+	GL_STUB_ALIAS(BindFragDataLocation, 906, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
+	GL_STUB_ALIAS(GetFragDataLocation, 907, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
+	GL_STUB_ALIAS(GetUniformuiv, 908, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIiv, 909, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIuiv, 910, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
+	GL_STUB_ALIAS(Uniform1ui, 911, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
+	GL_STUB_ALIAS(Uniform1uiv, 912, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
+	GL_STUB_ALIAS(Uniform2ui, 913, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
+	GL_STUB_ALIAS(Uniform2uiv, 914, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
+	GL_STUB_ALIAS(Uniform3ui, 915, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
+	GL_STUB_ALIAS(Uniform3uiv, 916, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
+	GL_STUB_ALIAS(Uniform4ui, 917, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
+	GL_STUB_ALIAS(Uniform4uiv, 918, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
+	GL_STUB_ALIAS(VertexAttribI1i, 919, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1iv, 920, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1ui, 921, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1uiv, 922, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2i, 923, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2iv, 924, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2ui, 925, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2uiv, 926, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3i, 927, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3iv, 928, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3ui, 929, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3uiv, 930, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4bv, 931, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4i, 932, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4iv, 933, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4sv, 934, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ubv, 935, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ui, 936, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4uiv, 937, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4usv, 938, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
+	GL_STUB_ALIAS(VertexAttribIPointer, 939, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayer, 940, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayerARB, 940, FramebufferTextureLayerARB@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(ColorMaski, 941, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
+	GL_STUB_ALIAS(Disablei, 942, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
+	GL_STUB_ALIAS(Enablei, 943, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
+	GL_STUB_ALIAS(GetBooleani_v, 944, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
+	GL_STUB_ALIAS(GetIntegeri_v, 945, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
+	GL_STUB_ALIAS(IsEnabledi, 946, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
+	GL_STUB_ALIAS(GetTexParameterIiv, 949, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
+	GL_STUB_ALIAS(GetTexParameterIuiv, 950, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
+	GL_STUB_ALIAS(TexParameterIiv, 951, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
+	GL_STUB_ALIAS(TexParameterIuiv, 952, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
+	GL_STUB_ALIAS(BeginConditionalRender, 953, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
+	GL_STUB_ALIAS(EndConditionalRender, 954, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
+	GL_STUB_ALIAS(BeginTransformFeedback, 955, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
+	GL_STUB_ALIAS(BindBufferBase, 956, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
+	GL_STUB_ALIAS(BindBufferRange, 958, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
+	GL_STUB_ALIAS(EndTransformFeedback, 959, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
+	GL_STUB_ALIAS(GetTransformFeedbackVarying, 960, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB_ALIAS(TransformFeedbackVaryings, 961, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
+	GL_STUB_ALIAS(ProvokingVertex, 962, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
 
 		GLOBL	GLNAME(gl_dispatch_functions_end)
 		HIDDEN(GLNAME(gl_dispatch_functions_end))
diff --git a/mesalib/src/mapi/glapi/glapitable.h b/mesalib/src/mapi/glapi/glapitable.h
index 4bc95cf94..857aef35a 100644
--- a/mesalib/src/mapi/glapi/glapitable.h
+++ b/mesalib/src/mapi/glapi/glapitable.h
@@ -641,382 +641,384 @@ struct _glapi_table
    void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 598 */
    void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 599 */
    void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 600 */
-   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 601 */
-   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 602 */
-   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 603 */
-   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 604 */
-   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 605 */
-   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 606 */
-   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 607 */
-   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 608 */
-   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 609 */
-   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 610 */
-   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 611 */
-   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 612 */
-   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 613 */
-   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 614 */
-   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 615 */
-   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 616 */
-   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 617 */
-   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 618 */
-   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 619 */
-   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 620 */
-   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 621 */
-   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 622 */
-   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 623 */
-   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 624 */
-   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 625 */
-   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 626 */
-   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 627 */
-   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 628 */
-   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 629 */
-   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 630 */
-   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 631 */
-   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 632 */
-   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 633 */
-   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 634 */
-   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 635 */
-   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 636 */
-   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 637 */
-   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 638 */
-   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 639 */
-   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 640 */
-   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 641 */
-   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 642 */
-   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 643 */
-   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 644 */
-   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 645 */
-   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 646 */
-   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 647 */
-   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 648 */
-   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 649 */
-   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 650 */
-   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 651 */
-   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 652 */
-   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 653 */
-   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 654 */
-   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 655 */
-   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 656 */
-   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 657 */
-   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 658 */
-   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 659 */
-   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 660 */
-   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 661 */
-   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 662 */
-   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 663 */
-   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 664 */
-   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 665 */
-   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 666 */
-   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 667 */
-   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 668 */
-   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 669 */
-   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 670 */
-   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 671 */
-   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 672 */
-   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 673 */
-   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 674 */
-   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 675 */
-   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 676 */
-   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 677 */
-   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 678 */
-   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 679 */
-   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 680 */
-   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 681 */
-   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 682 */
-   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 683 */
-   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 684 */
-   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 685 */
-   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 686 */
-   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 687 */
-   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 688 */
-   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 689 */
-   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 690 */
-   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 691 */
-   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 692 */
-   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 693 */
-   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 694 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 695 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 696 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 697 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 698 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 699 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 700 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 701 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 702 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 703 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 704 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 705 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 706 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 707 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 708 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 709 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 710 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 711 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 712 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 713 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 714 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 715 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 716 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 717 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 718 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 719 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 720 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 721 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 722 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 723 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 724 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 725 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 726 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 727 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 728 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 729 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 730 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 731 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 732 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 733 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 734 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 735 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 736 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 737 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 738 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 739 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 740 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 741 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 742 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 743 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 744 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 745 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 746 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 747 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 748 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 749 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 750 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 751 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 752 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 753 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 754 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 755 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 756 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 757 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 758 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 759 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 760 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 761 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 762 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 763 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 764 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 765 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 766 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 767 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 768 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 769 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 770 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 771 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 772 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 773 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 774 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 775 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 776 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 777 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 778 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 779 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 780 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 781 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 782 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 783 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 784 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 785 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 786 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 787 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 788 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 789 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 790 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 791 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 792 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 793 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 794 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 795 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 796 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 797 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 798 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 799 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 800 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 801 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 802 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 803 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 804 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 805 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 806 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 807 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 808 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 809 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 810 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 811 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 812 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 813 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 814 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 815 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 816 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 817 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 818 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 819 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 820 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 821 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 822 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 823 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 824 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 825 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 826 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 827 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 828 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 829 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 830 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 831 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 832 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 833 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 834 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 835 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 836 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 837 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 838 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 839 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 840 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 841 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 842 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 843 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 844 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 845 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 846 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 847 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 848 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 849 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 850 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 851 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 852 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 853 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 854 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 855 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 856 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 857 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 858 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 859 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 860 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 861 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 862 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 863 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 864 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 865 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 866 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 867 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 868 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 869 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 870 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 871 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 872 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 873 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 874 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 875 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 876 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 877 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 878 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 879 */
-   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 880 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 881 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 882 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 883 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 884 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 885 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 886 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 887 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 888 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 889 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 890 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 891 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 892 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 893 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 894 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 895 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 896 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 897 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 898 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 899 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 900 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 901 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 902 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 903 */
-   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 904 */
-   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 905 */
-   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 906 */
-   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 907 */
-   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 908 */
-   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 909 */
-   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 910 */
-   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 911 */
-   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 912 */
-   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 913 */
-   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 914 */
-   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 915 */
-   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 916 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 917 */
-   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 918 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 919 */
-   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 920 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 921 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 922 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 923 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 924 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 925 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 926 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 927 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 928 */
-   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 929 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 930 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 931 */
-   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 932 */
-   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 933 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 934 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 935 */
-   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 936 */
-   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 937 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 938 */
-   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 939 */
-   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 940 */
-   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 941 */
-   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 942 */
-   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 943 */
-   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 944 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 945 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 946 */
-   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 947 */
-   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 948 */
-   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 949 */
-   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 950 */
-   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 951 */
-   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 952 */
-   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 953 */
-   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 954 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 955 */
-   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 956 */
-   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 957 */
-   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 958 */
-   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 959 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 960 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 961 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 962 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 963 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 964 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 965 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 966 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 967 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 968 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 969 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 970 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 971 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 972 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 973 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 974 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 975 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 976 */
+   void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 601 */
+   GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 602 */
+   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 603 */
+   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 604 */
+   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 605 */
+   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 606 */
+   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 607 */
+   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 608 */
+   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 609 */
+   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 610 */
+   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 611 */
+   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 612 */
+   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 613 */
+   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 614 */
+   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 615 */
+   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 616 */
+   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 617 */
+   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 618 */
+   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 619 */
+   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 620 */
+   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 621 */
+   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 622 */
+   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 623 */
+   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 624 */
+   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 625 */
+   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 626 */
+   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 627 */
+   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 628 */
+   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 629 */
+   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 630 */
+   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 631 */
+   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 632 */
+   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 633 */
+   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 634 */
+   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 635 */
+   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 636 */
+   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 637 */
+   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 638 */
+   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 639 */
+   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 640 */
+   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 641 */
+   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 642 */
+   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 643 */
+   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 644 */
+   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 645 */
+   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 646 */
+   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 647 */
+   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 648 */
+   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 649 */
+   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 650 */
+   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 651 */
+   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 652 */
+   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 653 */
+   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 654 */
+   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 655 */
+   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 656 */
+   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 657 */
+   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 658 */
+   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 659 */
+   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 660 */
+   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 661 */
+   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 662 */
+   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 663 */
+   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 664 */
+   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 665 */
+   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 666 */
+   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 667 */
+   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 668 */
+   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 669 */
+   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 670 */
+   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 671 */
+   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 672 */
+   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 673 */
+   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 674 */
+   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 675 */
+   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 676 */
+   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 677 */
+   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 678 */
+   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 679 */
+   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 680 */
+   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 681 */
+   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 682 */
+   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 683 */
+   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 684 */
+   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 685 */
+   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 686 */
+   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 687 */
+   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 688 */
+   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 689 */
+   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 690 */
+   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 691 */
+   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 692 */
+   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 693 */
+   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 694 */
+   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 695 */
+   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 696 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 697 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 698 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 699 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 700 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 701 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 702 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 703 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 704 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 705 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 706 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 707 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 708 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 709 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 710 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 711 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 712 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 713 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 714 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 715 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 716 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 717 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 718 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 719 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 720 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 721 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 722 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 723 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 724 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 725 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 726 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 727 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 728 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 729 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 730 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 731 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 732 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 733 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 734 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 735 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 736 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 737 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 738 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 739 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 740 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 741 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 742 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 743 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 744 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 745 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 746 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 747 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 748 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 749 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 750 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 751 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 752 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 753 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 754 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 755 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 756 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 757 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 758 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 759 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 760 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 761 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 762 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 763 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 764 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 765 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 766 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 767 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 768 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 769 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 770 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 771 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 772 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 773 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 774 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 775 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 776 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 777 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 778 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 779 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 780 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 781 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 782 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 783 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 784 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 785 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 786 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 787 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 788 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 789 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 790 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 791 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 792 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 793 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 794 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 795 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 796 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 797 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 798 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 799 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 800 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 801 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 802 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 803 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 804 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 805 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 806 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 807 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 808 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 809 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 810 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 811 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 812 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 813 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 814 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 815 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 816 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 817 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 818 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 819 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 820 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 821 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 822 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 823 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 824 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 825 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 826 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 827 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 828 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 829 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 830 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 831 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 832 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 833 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 834 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 835 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 836 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 837 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 838 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 839 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 840 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 841 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 842 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 843 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 844 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 845 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 846 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 847 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 848 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 849 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 850 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 851 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 852 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 853 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 854 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 855 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 856 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 857 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 858 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 859 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 860 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 861 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 862 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 863 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 864 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 865 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 866 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 867 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 868 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 869 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 870 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 871 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 872 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 873 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 874 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 875 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 876 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 877 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 878 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 879 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 880 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 881 */
+   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 882 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 883 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 884 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 885 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 886 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 887 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 888 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 889 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 890 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 891 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 892 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 893 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 894 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 895 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 896 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 897 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 898 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 899 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 900 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 901 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 902 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 903 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 904 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 905 */
+   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 906 */
+   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 907 */
+   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 908 */
+   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 909 */
+   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 910 */
+   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 911 */
+   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 912 */
+   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 913 */
+   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 914 */
+   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 915 */
+   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 916 */
+   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 917 */
+   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 918 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 919 */
+   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 920 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 921 */
+   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 922 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 923 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 924 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 925 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 926 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 927 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 928 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 929 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 930 */
+   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 931 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 932 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 933 */
+   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 934 */
+   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 935 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 936 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 937 */
+   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 938 */
+   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 939 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 940 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 941 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 942 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 943 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 944 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 945 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 946 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 947 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 948 */
+   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 949 */
+   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 950 */
+   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 951 */
+   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 952 */
+   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 953 */
+   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 954 */
+   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 955 */
+   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 956 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 957 */
+   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 958 */
+   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 959 */
+   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 960 */
+   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 961 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 962 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 963 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 964 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 965 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 966 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 967 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 968 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 969 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 970 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 971 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 972 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 973 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 974 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 975 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 976 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 977 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 978 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/mesalib/src/mapi/glapi/glapitemp.h b/mesalib/src/mapi/glapi/glapitemp.h
index b018c7573..b159a9e45 100644
--- a/mesalib/src/mapi/glapi/glapitemp.h
+++ b/mesalib/src/mapi/glapi/glapitemp.h
@@ -4872,6 +4872,18 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncIndexedAMD)(GLuint buf, GLenum src, GLenum
    DISPATCH(BlendFunciARB, (buf, src, dst), (F, "glBlendFuncIndexedAMD(%d, 0x%x, 0x%x);\n", buf, src, dst));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name)
+{
+    (void) program; (void) colorNumber; (void) index; (void) name;
+   DISPATCH(BindFragDataLocationIndexed, (program, colorNumber, index, name), (F, "glBindFragDataLocationIndexed(%d, %d, %d, %p);\n", program, colorNumber, index, (const void *) name));
+}
+
+KEYWORD1 GLint KEYWORD2 NAME(GetFragDataIndex)(GLuint program, const GLchar * name)
+{
+    (void) program; (void) name;
+   RETURN_DISPATCH(GetFragDataIndex, (program, name), (F, "glGetFragDataIndex(%d, %p);\n", program, (const void *) name));
+}
+
 KEYWORD1 void KEYWORD2 NAME(BindSampler)(GLuint unit, GLuint sampler)
 {
     (void) unit; (void) sampler;
@@ -5438,65 +5450,65 @@ KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_696)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_696)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, GLint * params)
 {
     (void) pname; (void) params;
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLfloat param)
 {
     (void) pname; (void) param;
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLenum pname, GLint param)
 {
     (void) pname; (void) param;
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pname, const GLint * params)
 {
     (void) pname; (void) params;
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLclampf value, GLboolean invert)
 {
     (void) value; (void) invert;
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_705)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_705)(GLenum pattern)
 {
     (void) pattern;
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
@@ -5556,9 +5568,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_710)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_710)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(GLenum pname, GLfloat param)
 {
     (void) pname; (void) param;
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
@@ -5582,9 +5594,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_713)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_713)(GLenum pname, const GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
@@ -5889,9 +5901,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLenum mode)
 {
     (void) mode;
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
@@ -5909,9 +5921,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
     (void) sfactorRGB; (void) dfactorRGB; (void) sfactorAlpha; (void) dfactorAlpha;
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
@@ -6347,73 +6359,73 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
     (void) mode; (void) first; (void) count; (void) primcount; (void) modestride;
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
     (void) mode; (void) count; (void) type; (void) indices; (void) primcount; (void) modestride;
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, const GLuint * fences)
 {
     (void) n; (void) fences;
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence)
 {
     (void) fence;
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLsizei n, GLuint * fences)
 {
     (void) n; (void) fences;
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum pname, GLint * params)
 {
     (void) fence; (void) pname; (void) params;
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_786)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_786)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence)
 {
     (void) fence;
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLuint fence, GLenum condition)
 {
     (void) fence; (void) condition;
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_790)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_790)(GLuint fence)
 {
     (void) fence;
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
@@ -6945,17 +6957,17 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_869)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_869)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLenum face)
 {
     (void) face;
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_870)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_870)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLuint array)
 {
     (void) array;
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
@@ -6967,17 +6979,17 @@ KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_873)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_873)(GLsizei n, const GLuint * arrays)
 {
     (void) n; (void) arrays;
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_874)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_874)(GLsizei n, GLuint * arrays)
 {
     (void) n; (void) arrays;
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
@@ -6989,9 +7001,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_873)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_875)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_873)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_875)(GLuint array)
 {
     (void) array;
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
@@ -7033,16 +7045,16 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartIndexNV)(GLuint index)
+KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartIndex)(GLuint index)
 {
     (void) index;
-   DISPATCH(PrimitiveRestartIndexNV, (index), (F, "glPrimitiveRestartIndexNV(%d);\n", index));
+   DISPATCH(PrimitiveRestartIndexNV, (index), (F, "glPrimitiveRestartIndex(%d);\n", index));
 }
 
-KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartIndex)(GLuint index)
+KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartIndexNV)(GLuint index)
 {
     (void) index;
-   DISPATCH(PrimitiveRestartIndexNV, (index), (F, "glPrimitiveRestartIndex(%d);\n", index));
+   DISPATCH(PrimitiveRestartIndexNV, (index), (F, "glPrimitiveRestartIndexNV(%d);\n", index));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartNV)(void)
@@ -7050,9 +7062,9 @@ KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartNV)(void)
    DISPATCH(PrimitiveRestartNV, (), (F, "glPrimitiveRestartNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_882)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_884)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_882)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_884)(GLclampd zmin, GLclampd zmax)
 {
     (void) zmin; (void) zmax;
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
@@ -7064,9 +7076,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_883)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_885)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_883)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_885)(GLenum modeRGB, GLenum modeA)
 {
     (void) modeRGB; (void) modeA;
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
@@ -7282,25 +7294,25 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_901)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_901)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
     (void) srcX0; (void) srcY0; (void) srcX1; (void) srcY1; (void) dstX0; (void) dstY0; (void) dstX1; (void) dstY1; (void) mask; (void) filter;
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLenum target, GLenum pname, GLint param)
 {
     (void) target; (void) pname; (void) param;
    DISPATCH(BufferParameteriAPPLE, (target, pname, param), (F, "glBufferParameteriAPPLE(0x%x, 0x%x, %d);\n", target, pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_905)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_905)(GLenum target, GLintptr offset, GLsizeiptr size)
 {
     (void) target; (void) offset; (void) size;
    DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
@@ -7864,21 +7876,16 @@ KEYWORD1 void KEYWORD2 NAME(TexParameterIuiv)(GLenum target, GLenum pname, const
    DISPATCH(TexParameterIuivEXT, (target, pname, params), (F, "glTexParameterIuiv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BeginConditionalRenderNV)(GLuint query, GLenum mode)
-{
-    (void) query; (void) mode;
-   DISPATCH(BeginConditionalRenderNV, (query, mode), (F, "glBeginConditionalRenderNV(%d, 0x%x);\n", query, mode));
-}
-
 KEYWORD1 void KEYWORD2 NAME(BeginConditionalRender)(GLuint query, GLenum mode)
 {
     (void) query; (void) mode;
    DISPATCH(BeginConditionalRenderNV, (query, mode), (F, "glBeginConditionalRender(%d, 0x%x);\n", query, mode));
 }
 
-KEYWORD1 void KEYWORD2 NAME(EndConditionalRenderNV)(void)
+KEYWORD1 void KEYWORD2 NAME(BeginConditionalRenderNV)(GLuint query, GLenum mode)
 {
-   DISPATCH(EndConditionalRenderNV, (), (F, "glEndConditionalRenderNV();\n"));
+    (void) query; (void) mode;
+   DISPATCH(BeginConditionalRenderNV, (query, mode), (F, "glBeginConditionalRenderNV(%d, 0x%x);\n", query, mode));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EndConditionalRender)(void)
@@ -7886,10 +7893,9 @@ KEYWORD1 void KEYWORD2 NAME(EndConditionalRender)(void)
    DISPATCH(EndConditionalRenderNV, (), (F, "glEndConditionalRender();\n"));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BeginTransformFeedbackEXT)(GLenum mode)
+KEYWORD1 void KEYWORD2 NAME(EndConditionalRenderNV)(void)
 {
-    (void) mode;
-   DISPATCH(BeginTransformFeedbackEXT, (mode), (F, "glBeginTransformFeedbackEXT(0x%x);\n", mode));
+   DISPATCH(EndConditionalRenderNV, (), (F, "glEndConditionalRenderNV();\n"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BeginTransformFeedback)(GLenum mode)
@@ -7898,10 +7904,10 @@ KEYWORD1 void KEYWORD2 NAME(BeginTransformFeedback)(GLenum mode)
    DISPATCH(BeginTransformFeedbackEXT, (mode), (F, "glBeginTransformFeedback(0x%x);\n", mode));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer)
+KEYWORD1 void KEYWORD2 NAME(BeginTransformFeedbackEXT)(GLenum mode)
 {
-    (void) target; (void) index; (void) buffer;
-   DISPATCH(BindBufferBaseEXT, (target, index, buffer), (F, "glBindBufferBaseEXT(0x%x, %d, %d);\n", target, index, buffer));
+    (void) mode;
+   DISPATCH(BeginTransformFeedbackEXT, (mode), (F, "glBeginTransformFeedbackEXT(0x%x);\n", mode));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BindBufferBase)(GLenum target, GLuint index, GLuint buffer)
@@ -7910,16 +7916,16 @@ KEYWORD1 void KEYWORD2 NAME(BindBufferBase)(GLenum target, GLuint index, GLuint
    DISPATCH(BindBufferBaseEXT, (target, index, buffer), (F, "glBindBufferBase(0x%x, %d, %d);\n", target, index, buffer));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)
+KEYWORD1 void KEYWORD2 NAME(BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer)
 {
-    (void) target; (void) index; (void) buffer; (void) offset;
-   DISPATCH(BindBufferOffsetEXT, (target, index, buffer, offset), (F, "glBindBufferOffsetEXT(0x%x, %d, %d, %d);\n", target, index, buffer, offset));
+    (void) target; (void) index; (void) buffer;
+   DISPATCH(BindBufferBaseEXT, (target, index, buffer), (F, "glBindBufferBaseEXT(0x%x, %d, %d);\n", target, index, buffer));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
+KEYWORD1 void KEYWORD2 NAME(BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)
 {
-    (void) target; (void) index; (void) buffer; (void) offset; (void) size;
-   DISPATCH(BindBufferRangeEXT, (target, index, buffer, offset, size), (F, "glBindBufferRangeEXT(0x%x, %d, %d, %d, %d);\n", target, index, buffer, offset, size));
+    (void) target; (void) index; (void) buffer; (void) offset;
+   DISPATCH(BindBufferOffsetEXT, (target, index, buffer, offset), (F, "glBindBufferOffsetEXT(0x%x, %d, %d, %d);\n", target, index, buffer, offset));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
@@ -7928,9 +7934,10 @@ KEYWORD1 void KEYWORD2 NAME(BindBufferRange)(GLenum target, GLuint index, GLuint
    DISPATCH(BindBufferRangeEXT, (target, index, buffer, offset, size), (F, "glBindBufferRange(0x%x, %d, %d, %d, %d);\n", target, index, buffer, offset, size));
 }
 
-KEYWORD1 void KEYWORD2 NAME(EndTransformFeedbackEXT)(void)
+KEYWORD1 void KEYWORD2 NAME(BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-   DISPATCH(EndTransformFeedbackEXT, (), (F, "glEndTransformFeedbackEXT();\n"));
+    (void) target; (void) index; (void) buffer; (void) offset; (void) size;
+   DISPATCH(BindBufferRangeEXT, (target, index, buffer, offset, size), (F, "glBindBufferRangeEXT(0x%x, %d, %d, %d, %d);\n", target, index, buffer, offset, size));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EndTransformFeedback)(void)
@@ -7938,10 +7945,9 @@ KEYWORD1 void KEYWORD2 NAME(EndTransformFeedback)(void)
    DISPATCH(EndTransformFeedbackEXT, (), (F, "glEndTransformFeedback();\n"));
 }
 
-KEYWORD1 void KEYWORD2 NAME(GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name)
+KEYWORD1 void KEYWORD2 NAME(EndTransformFeedbackEXT)(void)
 {
-    (void) program; (void) index; (void) bufSize; (void) length; (void) size; (void) type; (void) name;
-   DISPATCH(GetTransformFeedbackVaryingEXT, (program, index, bufSize, length, size, type, name), (F, "glGetTransformFeedbackVaryingEXT(%d, %d, %d, %p, %p, %p, %p);\n", program, index, bufSize, (const void *) length, (const void *) size, (const void *) type, (const void *) name));
+   DISPATCH(EndTransformFeedbackEXT, (), (F, "glEndTransformFeedbackEXT();\n"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name)
@@ -7950,10 +7956,10 @@ KEYWORD1 void KEYWORD2 NAME(GetTransformFeedbackVarying)(GLuint program, GLuint
    DISPATCH(GetTransformFeedbackVaryingEXT, (program, index, bufSize, length, size, type, name), (F, "glGetTransformFeedbackVarying(%d, %d, %d, %p, %p, %p, %p);\n", program, index, bufSize, (const void *) length, (const void *) size, (const void *) type, (const void *) name));
 }
 
-KEYWORD1 void KEYWORD2 NAME(TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode)
+KEYWORD1 void KEYWORD2 NAME(GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name)
 {
-    (void) program; (void) count; (void) varyings; (void) bufferMode;
-   DISPATCH(TransformFeedbackVaryingsEXT, (program, count, varyings, bufferMode), (F, "glTransformFeedbackVaryingsEXT(%d, %d, %p, 0x%x);\n", program, count, (const void *) varyings, bufferMode));
+    (void) program; (void) index; (void) bufSize; (void) length; (void) size; (void) type; (void) name;
+   DISPATCH(GetTransformFeedbackVaryingEXT, (program, index, bufSize, length, size, type, name), (F, "glGetTransformFeedbackVaryingEXT(%d, %d, %d, %p, %p, %p, %p);\n", program, index, bufSize, (const void *) length, (const void *) size, (const void *) type, (const void *) name));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* * varyings, GLenum bufferMode)
@@ -7962,6 +7968,12 @@ KEYWORD1 void KEYWORD2 NAME(TransformFeedbackVaryings)(GLuint program, GLsizei c
    DISPATCH(TransformFeedbackVaryingsEXT, (program, count, varyings, bufferMode), (F, "glTransformFeedbackVaryings(%d, %d, %p, 0x%x);\n", program, count, (const void *) varyings, bufferMode));
 }
 
+KEYWORD1 void KEYWORD2 NAME(TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode)
+{
+    (void) program; (void) count; (void) varyings; (void) bufferMode;
+   DISPATCH(TransformFeedbackVaryingsEXT, (program, count, varyings, bufferMode), (F, "glTransformFeedbackVaryingsEXT(%d, %d, %p, 0x%x);\n", program, count, (const void *) varyings, bufferMode));
+}
+
 KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
 {
     (void) mode;
@@ -7974,17 +7986,17 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertex)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertex(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_961)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_963)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_961)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_963)(GLenum target, GLenum pname, GLvoid ** params)
 {
     (void) target; (void) pname; (void) params;
    DISPATCH(GetTexParameterPointervAPPLE, (target, pname, params), (F, "glGetTexParameterPointervAPPLE(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_962)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_964)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_962)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_964)(GLenum target, GLsizei length, GLvoid * pointer)
 {
     (void) target; (void) length; (void) pointer;
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
@@ -8031,41 +8043,41 @@ KEYWORD1 void KEYWORD2 NAME(TextureBarrierNV)(void)
    DISPATCH(TextureBarrierNV, (), (F, "glTextureBarrierNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_970)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_970)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
     (void) frontfunc; (void) backfunc; (void) ref; (void) mask;
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_971)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_971)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
     (void) target; (void) index; (void) count; (void) params;
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
     (void) target; (void) index; (void) count; (void) params;
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_975)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_975)(GLuint id, GLenum pname, GLint64EXT * params)
 {
     (void) id; (void) pname; (void) params;
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_976)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_976)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
     (void) id; (void) pname; (void) params;
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
@@ -8857,6 +8869,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(BlendEquationiARB),
    TABLE_ENTRY(BlendFuncSeparateiARB),
    TABLE_ENTRY(BlendFunciARB),
+   TABLE_ENTRY(BindFragDataLocationIndexed),
+   TABLE_ENTRY(GetFragDataIndex),
    TABLE_ENTRY(BindSampler),
    TABLE_ENTRY(DeleteSamplers),
    TABLE_ENTRY(GenSamplers),
@@ -8952,14 +8966,14 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(TextureStorage2DEXT),
    TABLE_ENTRY(TextureStorage3DEXT),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_696),
-   TABLE_ENTRY(_dispatch_stub_697),
    TABLE_ENTRY(_dispatch_stub_698),
    TABLE_ENTRY(_dispatch_stub_699),
    TABLE_ENTRY(_dispatch_stub_700),
    TABLE_ENTRY(_dispatch_stub_701),
    TABLE_ENTRY(_dispatch_stub_702),
    TABLE_ENTRY(_dispatch_stub_703),
+   TABLE_ENTRY(_dispatch_stub_704),
+   TABLE_ENTRY(_dispatch_stub_705),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -8994,7 +9008,7 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_738),
+   TABLE_ENTRY(_dispatch_stub_740),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -9036,8 +9050,6 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_780),
-   TABLE_ENTRY(_dispatch_stub_781),
    TABLE_ENTRY(_dispatch_stub_782),
    TABLE_ENTRY(_dispatch_stub_783),
    TABLE_ENTRY(_dispatch_stub_784),
@@ -9045,6 +9057,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_786),
    TABLE_ENTRY(_dispatch_stub_787),
    TABLE_ENTRY(_dispatch_stub_788),
+   TABLE_ENTRY(_dispatch_stub_789),
+   TABLE_ENTRY(_dispatch_stub_790),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -9125,11 +9139,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_869),
-   TABLE_ENTRY(_dispatch_stub_870),
    TABLE_ENTRY(_dispatch_stub_871),
    TABLE_ENTRY(_dispatch_stub_872),
    TABLE_ENTRY(_dispatch_stub_873),
+   TABLE_ENTRY(_dispatch_stub_874),
+   TABLE_ENTRY(_dispatch_stub_875),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
@@ -9138,8 +9152,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
    TABLE_ENTRY(PrimitiveRestartIndexNV),
    TABLE_ENTRY(PrimitiveRestartNV),
-   TABLE_ENTRY(_dispatch_stub_882),
-   TABLE_ENTRY(_dispatch_stub_883),
+   TABLE_ENTRY(_dispatch_stub_884),
+   TABLE_ENTRY(_dispatch_stub_885),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -9157,9 +9171,9 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_901),
-   TABLE_ENTRY(_dispatch_stub_902),
    TABLE_ENTRY(_dispatch_stub_903),
+   TABLE_ENTRY(_dispatch_stub_904),
+   TABLE_ENTRY(_dispatch_stub_905),
    TABLE_ENTRY(BindFragDataLocationEXT),
    TABLE_ENTRY(GetFragDataLocationEXT),
    TABLE_ENTRY(GetUniformuivEXT),
@@ -9217,8 +9231,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetTransformFeedbackVaryingEXT),
    TABLE_ENTRY(TransformFeedbackVaryingsEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_961),
-   TABLE_ENTRY(_dispatch_stub_962),
+   TABLE_ENTRY(_dispatch_stub_963),
+   TABLE_ENTRY(_dispatch_stub_964),
    TABLE_ENTRY(GetObjectParameterivAPPLE),
    TABLE_ENTRY(ObjectPurgeableAPPLE),
    TABLE_ENTRY(ObjectUnpurgeableAPPLE),
@@ -9226,11 +9240,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(CreateShaderProgramEXT),
    TABLE_ENTRY(UseShaderProgramEXT),
    TABLE_ENTRY(TextureBarrierNV),
-   TABLE_ENTRY(_dispatch_stub_970),
-   TABLE_ENTRY(_dispatch_stub_971),
    TABLE_ENTRY(_dispatch_stub_972),
    TABLE_ENTRY(_dispatch_stub_973),
    TABLE_ENTRY(_dispatch_stub_974),
+   TABLE_ENTRY(_dispatch_stub_975),
+   TABLE_ENTRY(_dispatch_stub_976),
    TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
    TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* A whole bunch of no-op functions.  These might be called
@@ -9542,10 +9556,10 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(BlendFuncIndexedAMD),
    TABLE_ENTRY(PointParameterf),
    TABLE_ENTRY(PointParameterfARB),
-   TABLE_ENTRY(_dispatch_stub_710),
+   TABLE_ENTRY(_dispatch_stub_712),
    TABLE_ENTRY(PointParameterfv),
    TABLE_ENTRY(PointParameterfvARB),
-   TABLE_ENTRY(_dispatch_stub_711),
+   TABLE_ENTRY(_dispatch_stub_713),
    TABLE_ENTRY(SecondaryColor3b),
    TABLE_ENTRY(SecondaryColor3bv),
    TABLE_ENTRY(SecondaryColor3d),
@@ -9571,7 +9585,7 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoordf),
    TABLE_ENTRY(FogCoordfv),
    TABLE_ENTRY(BlendFuncSeparate),
-   TABLE_ENTRY(_dispatch_stub_739),
+   TABLE_ENTRY(_dispatch_stub_741),
    TABLE_ENTRY(WindowPos2d),
    TABLE_ENTRY(WindowPos2dARB),
    TABLE_ENTRY(WindowPos2dv),
diff --git a/mesalib/src/mapi/glapi/glprocs.h b/mesalib/src/mapi/glapi/glprocs.h
index 3047d2f49..10c69c850 100644
--- a/mesalib/src/mapi/glapi/glprocs.h
+++ b/mesalib/src/mapi/glapi/glprocs.h
@@ -653,6 +653,8 @@ static const char gl_string_table[] =
     "glBlendEquationiARB\0"
     "glBlendFuncSeparateiARB\0"
     "glBlendFunciARB\0"
+    "glBindFragDataLocationIndexed\0"
+    "glGetFragDataIndex\0"
     "glBindSampler\0"
     "glDeleteSamplers\0"
     "glGenSamplers\0"
@@ -1411,17 +1413,15 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_696 mgl_dispatch_stub_696
-#define gl_dispatch_stub_697 mgl_dispatch_stub_697
 #define gl_dispatch_stub_698 mgl_dispatch_stub_698
 #define gl_dispatch_stub_699 mgl_dispatch_stub_699
 #define gl_dispatch_stub_700 mgl_dispatch_stub_700
 #define gl_dispatch_stub_701 mgl_dispatch_stub_701
 #define gl_dispatch_stub_702 mgl_dispatch_stub_702
 #define gl_dispatch_stub_703 mgl_dispatch_stub_703
-#define gl_dispatch_stub_738 mgl_dispatch_stub_738
-#define gl_dispatch_stub_780 mgl_dispatch_stub_780
-#define gl_dispatch_stub_781 mgl_dispatch_stub_781
+#define gl_dispatch_stub_704 mgl_dispatch_stub_704
+#define gl_dispatch_stub_705 mgl_dispatch_stub_705
+#define gl_dispatch_stub_740 mgl_dispatch_stub_740
 #define gl_dispatch_stub_782 mgl_dispatch_stub_782
 #define gl_dispatch_stub_783 mgl_dispatch_stub_783
 #define gl_dispatch_stub_784 mgl_dispatch_stub_784
@@ -1429,23 +1429,25 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_786 mgl_dispatch_stub_786
 #define gl_dispatch_stub_787 mgl_dispatch_stub_787
 #define gl_dispatch_stub_788 mgl_dispatch_stub_788
-#define gl_dispatch_stub_869 mgl_dispatch_stub_869
-#define gl_dispatch_stub_870 mgl_dispatch_stub_870
+#define gl_dispatch_stub_789 mgl_dispatch_stub_789
+#define gl_dispatch_stub_790 mgl_dispatch_stub_790
 #define gl_dispatch_stub_871 mgl_dispatch_stub_871
 #define gl_dispatch_stub_872 mgl_dispatch_stub_872
 #define gl_dispatch_stub_873 mgl_dispatch_stub_873
-#define gl_dispatch_stub_882 mgl_dispatch_stub_882
-#define gl_dispatch_stub_883 mgl_dispatch_stub_883
-#define gl_dispatch_stub_901 mgl_dispatch_stub_901
-#define gl_dispatch_stub_902 mgl_dispatch_stub_902
+#define gl_dispatch_stub_874 mgl_dispatch_stub_874
+#define gl_dispatch_stub_875 mgl_dispatch_stub_875
+#define gl_dispatch_stub_884 mgl_dispatch_stub_884
+#define gl_dispatch_stub_885 mgl_dispatch_stub_885
 #define gl_dispatch_stub_903 mgl_dispatch_stub_903
-#define gl_dispatch_stub_961 mgl_dispatch_stub_961
-#define gl_dispatch_stub_962 mgl_dispatch_stub_962
-#define gl_dispatch_stub_970 mgl_dispatch_stub_970
-#define gl_dispatch_stub_971 mgl_dispatch_stub_971
+#define gl_dispatch_stub_904 mgl_dispatch_stub_904
+#define gl_dispatch_stub_905 mgl_dispatch_stub_905
+#define gl_dispatch_stub_963 mgl_dispatch_stub_963
+#define gl_dispatch_stub_964 mgl_dispatch_stub_964
 #define gl_dispatch_stub_972 mgl_dispatch_stub_972
 #define gl_dispatch_stub_973 mgl_dispatch_stub_973
 #define gl_dispatch_stub_974 mgl_dispatch_stub_974
+#define gl_dispatch_stub_975 mgl_dispatch_stub_975
+#define gl_dispatch_stub_976 mgl_dispatch_stub_976
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1463,41 +1465,41 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_696(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_697(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_698(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_699(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_700(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_701(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_702(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_703(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_738(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_780(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_781(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_782(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_783(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_784(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_785(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_786(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_787(GLuint fence, GLenum condition);
+void GLAPIENTRY gl_dispatch_stub_698(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_699(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_700(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_701(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_702(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_703(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_704(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_705(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_740(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_782(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_783(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_784(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_785(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_786(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_787(GLuint fence, GLenum pname, GLint * params);
 GLboolean GLAPIENTRY gl_dispatch_stub_788(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_869(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_870(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_871(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_872(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_873(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_882(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_883(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_901(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_902(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_903(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_961(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_962(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_970(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_971(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_972(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_973(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_974(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_789(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_790(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_871(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_872(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_873(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_874(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_875(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_884(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_885(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_903(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_904(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_905(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_963(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_964(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_972(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_973(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_974(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_975(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_976(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2102,747 +2104,749 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 9691, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
     NAME_FUNC_OFFSET( 9711, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
     NAME_FUNC_OFFSET( 9735, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET( 9751, glBindSampler, glBindSampler, NULL, 601),
-    NAME_FUNC_OFFSET( 9765, glDeleteSamplers, glDeleteSamplers, NULL, 602),
-    NAME_FUNC_OFFSET( 9782, glGenSamplers, glGenSamplers, NULL, 603),
-    NAME_FUNC_OFFSET( 9796, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 604),
-    NAME_FUNC_OFFSET( 9821, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 605),
-    NAME_FUNC_OFFSET( 9847, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 606),
-    NAME_FUNC_OFFSET( 9871, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 607),
-    NAME_FUNC_OFFSET( 9895, glIsSampler, glIsSampler, NULL, 608),
-    NAME_FUNC_OFFSET( 9907, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 609),
-    NAME_FUNC_OFFSET( 9929, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 610),
-    NAME_FUNC_OFFSET( 9952, glSamplerParameterf, glSamplerParameterf, NULL, 611),
-    NAME_FUNC_OFFSET( 9972, glSamplerParameterfv, glSamplerParameterfv, NULL, 612),
-    NAME_FUNC_OFFSET( 9993, glSamplerParameteri, glSamplerParameteri, NULL, 613),
-    NAME_FUNC_OFFSET(10013, glSamplerParameteriv, glSamplerParameteriv, NULL, 614),
-    NAME_FUNC_OFFSET(10034, glColorP3ui, glColorP3ui, NULL, 615),
-    NAME_FUNC_OFFSET(10046, glColorP3uiv, glColorP3uiv, NULL, 616),
-    NAME_FUNC_OFFSET(10059, glColorP4ui, glColorP4ui, NULL, 617),
-    NAME_FUNC_OFFSET(10071, glColorP4uiv, glColorP4uiv, NULL, 618),
-    NAME_FUNC_OFFSET(10084, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 619),
-    NAME_FUNC_OFFSET(10104, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 620),
-    NAME_FUNC_OFFSET(10125, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 621),
-    NAME_FUNC_OFFSET(10145, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 622),
-    NAME_FUNC_OFFSET(10166, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 623),
-    NAME_FUNC_OFFSET(10186, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 624),
-    NAME_FUNC_OFFSET(10207, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 625),
-    NAME_FUNC_OFFSET(10227, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 626),
-    NAME_FUNC_OFFSET(10248, glNormalP3ui, glNormalP3ui, NULL, 627),
-    NAME_FUNC_OFFSET(10261, glNormalP3uiv, glNormalP3uiv, NULL, 628),
-    NAME_FUNC_OFFSET(10275, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 629),
-    NAME_FUNC_OFFSET(10296, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 630),
-    NAME_FUNC_OFFSET(10318, glTexCoordP1ui, glTexCoordP1ui, NULL, 631),
-    NAME_FUNC_OFFSET(10333, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 632),
-    NAME_FUNC_OFFSET(10349, glTexCoordP2ui, glTexCoordP2ui, NULL, 633),
-    NAME_FUNC_OFFSET(10364, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 634),
-    NAME_FUNC_OFFSET(10380, glTexCoordP3ui, glTexCoordP3ui, NULL, 635),
-    NAME_FUNC_OFFSET(10395, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 636),
-    NAME_FUNC_OFFSET(10411, glTexCoordP4ui, glTexCoordP4ui, NULL, 637),
-    NAME_FUNC_OFFSET(10426, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 638),
-    NAME_FUNC_OFFSET(10442, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 639),
-    NAME_FUNC_OFFSET(10461, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 640),
-    NAME_FUNC_OFFSET(10481, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 641),
-    NAME_FUNC_OFFSET(10500, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 642),
-    NAME_FUNC_OFFSET(10520, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 643),
-    NAME_FUNC_OFFSET(10539, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 644),
-    NAME_FUNC_OFFSET(10559, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 645),
-    NAME_FUNC_OFFSET(10578, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 646),
-    NAME_FUNC_OFFSET(10598, glVertexP2ui, glVertexP2ui, NULL, 647),
-    NAME_FUNC_OFFSET(10611, glVertexP2uiv, glVertexP2uiv, NULL, 648),
-    NAME_FUNC_OFFSET(10625, glVertexP3ui, glVertexP3ui, NULL, 649),
-    NAME_FUNC_OFFSET(10638, glVertexP3uiv, glVertexP3uiv, NULL, 650),
-    NAME_FUNC_OFFSET(10652, glVertexP4ui, glVertexP4ui, NULL, 651),
-    NAME_FUNC_OFFSET(10665, glVertexP4uiv, glVertexP4uiv, NULL, 652),
-    NAME_FUNC_OFFSET(10679, glBindTransformFeedback, glBindTransformFeedback, NULL, 653),
-    NAME_FUNC_OFFSET(10703, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 654),
-    NAME_FUNC_OFFSET(10730, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 655),
-    NAME_FUNC_OFFSET(10754, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 656),
-    NAME_FUNC_OFFSET(10778, glIsTransformFeedback, glIsTransformFeedback, NULL, 657),
-    NAME_FUNC_OFFSET(10800, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 658),
-    NAME_FUNC_OFFSET(10825, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 659),
-    NAME_FUNC_OFFSET(10851, glClearDepthf, glClearDepthf, NULL, 660),
-    NAME_FUNC_OFFSET(10865, glDepthRangef, glDepthRangef, NULL, 661),
-    NAME_FUNC_OFFSET(10879, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 662),
-    NAME_FUNC_OFFSET(10906, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 663),
-    NAME_FUNC_OFFSET(10930, glShaderBinary, glShaderBinary, NULL, 664),
-    NAME_FUNC_OFFSET(10945, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 665),
-    NAME_FUNC_OFFSET(10971, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 666),
-    NAME_FUNC_OFFSET(10996, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 667),
-    NAME_FUNC_OFFSET(11020, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 668),
-    NAME_FUNC_OFFSET(11044, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 669),
-    NAME_FUNC_OFFSET(11072, glGetnColorTableARB, glGetnColorTableARB, NULL, 670),
-    NAME_FUNC_OFFSET(11092, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 671),
-    NAME_FUNC_OFFSET(11120, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 672),
-    NAME_FUNC_OFFSET(11147, glGetnHistogramARB, glGetnHistogramARB, NULL, 673),
-    NAME_FUNC_OFFSET(11166, glGetnMapdvARB, glGetnMapdvARB, NULL, 674),
-    NAME_FUNC_OFFSET(11181, glGetnMapfvARB, glGetnMapfvARB, NULL, 675),
-    NAME_FUNC_OFFSET(11196, glGetnMapivARB, glGetnMapivARB, NULL, 676),
-    NAME_FUNC_OFFSET(11211, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 677),
-    NAME_FUNC_OFFSET(11227, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 678),
-    NAME_FUNC_OFFSET(11247, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 679),
-    NAME_FUNC_OFFSET(11268, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 680),
-    NAME_FUNC_OFFSET(11289, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 681),
-    NAME_FUNC_OFFSET(11313, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 682),
-    NAME_FUNC_OFFSET(11338, glGetnTexImageARB, glGetnTexImageARB, NULL, 683),
-    NAME_FUNC_OFFSET(11356, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 684),
-    NAME_FUNC_OFFSET(11375, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 685),
-    NAME_FUNC_OFFSET(11394, glGetnUniformivARB, glGetnUniformivARB, NULL, 686),
-    NAME_FUNC_OFFSET(11413, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 687),
-    NAME_FUNC_OFFSET(11433, glReadnPixelsARB, glReadnPixelsARB, NULL, 688),
-    NAME_FUNC_OFFSET(11450, glTexStorage1D, glTexStorage1D, NULL, 689),
-    NAME_FUNC_OFFSET(11465, glTexStorage2D, glTexStorage2D, NULL, 690),
-    NAME_FUNC_OFFSET(11480, glTexStorage3D, glTexStorage3D, NULL, 691),
-    NAME_FUNC_OFFSET(11495, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 692),
-    NAME_FUNC_OFFSET(11517, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 693),
-    NAME_FUNC_OFFSET(11539, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 694),
-    NAME_FUNC_OFFSET(11561, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 695),
-    NAME_FUNC_OFFSET(11580, gl_dispatch_stub_696, gl_dispatch_stub_696, NULL, 696),
-    NAME_FUNC_OFFSET(11612, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL, 697),
-    NAME_FUNC_OFFSET(11644, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
-    NAME_FUNC_OFFSET(11672, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
-    NAME_FUNC_OFFSET(11701, gl_dispatch_stub_700, gl_dispatch_stub_700, NULL, 700),
-    NAME_FUNC_OFFSET(11729, gl_dispatch_stub_701, gl_dispatch_stub_701, NULL, 701),
-    NAME_FUNC_OFFSET(11758, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
-    NAME_FUNC_OFFSET(11775, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
-    NAME_FUNC_OFFSET(11795, glColorPointerEXT, glColorPointerEXT, NULL, 704),
-    NAME_FUNC_OFFSET(11813, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 705),
-    NAME_FUNC_OFFSET(11834, glIndexPointerEXT, glIndexPointerEXT, NULL, 706),
-    NAME_FUNC_OFFSET(11852, glNormalPointerEXT, glNormalPointerEXT, NULL, 707),
-    NAME_FUNC_OFFSET(11871, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 708),
-    NAME_FUNC_OFFSET(11892, glVertexPointerEXT, glVertexPointerEXT, NULL, 709),
-    NAME_FUNC_OFFSET(11911, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
-    NAME_FUNC_OFFSET(11932, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
-    NAME_FUNC_OFFSET(11954, glLockArraysEXT, glLockArraysEXT, NULL, 712),
-    NAME_FUNC_OFFSET(11970, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 713),
-    NAME_FUNC_OFFSET(11988, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 714),
-    NAME_FUNC_OFFSET(12010, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 715),
-    NAME_FUNC_OFFSET(12033, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 716),
-    NAME_FUNC_OFFSET(12055, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 717),
-    NAME_FUNC_OFFSET(12078, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 718),
-    NAME_FUNC_OFFSET(12100, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 719),
-    NAME_FUNC_OFFSET(12123, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 720),
-    NAME_FUNC_OFFSET(12145, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 721),
-    NAME_FUNC_OFFSET(12168, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 722),
-    NAME_FUNC_OFFSET(12190, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 723),
-    NAME_FUNC_OFFSET(12213, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 724),
-    NAME_FUNC_OFFSET(12236, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 725),
-    NAME_FUNC_OFFSET(12260, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 726),
-    NAME_FUNC_OFFSET(12283, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 727),
-    NAME_FUNC_OFFSET(12307, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 728),
-    NAME_FUNC_OFFSET(12330, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 729),
-    NAME_FUNC_OFFSET(12354, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 730),
-    NAME_FUNC_OFFSET(12381, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 731),
-    NAME_FUNC_OFFSET(12402, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 732),
-    NAME_FUNC_OFFSET(12425, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 733),
-    NAME_FUNC_OFFSET(12446, glFogCoorddEXT, glFogCoorddEXT, NULL, 734),
-    NAME_FUNC_OFFSET(12461, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 735),
-    NAME_FUNC_OFFSET(12477, glFogCoordfEXT, glFogCoordfEXT, NULL, 736),
-    NAME_FUNC_OFFSET(12492, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 737),
-    NAME_FUNC_OFFSET(12508, gl_dispatch_stub_738, gl_dispatch_stub_738, NULL, 738),
-    NAME_FUNC_OFFSET(12526, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 739),
-    NAME_FUNC_OFFSET(12549, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 740),
-    NAME_FUNC_OFFSET(12575, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 741),
-    NAME_FUNC_OFFSET(12596, glCombinerInputNV, glCombinerInputNV, NULL, 742),
-    NAME_FUNC_OFFSET(12614, glCombinerOutputNV, glCombinerOutputNV, NULL, 743),
-    NAME_FUNC_OFFSET(12633, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 744),
-    NAME_FUNC_OFFSET(12656, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 745),
-    NAME_FUNC_OFFSET(12680, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 746),
-    NAME_FUNC_OFFSET(12703, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 747),
-    NAME_FUNC_OFFSET(12727, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 748),
-    NAME_FUNC_OFFSET(12750, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 749),
-    NAME_FUNC_OFFSET(12782, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 750),
-    NAME_FUNC_OFFSET(12814, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 751),
-    NAME_FUNC_OFFSET(12847, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 752),
-    NAME_FUNC_OFFSET(12880, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 753),
-    NAME_FUNC_OFFSET(12917, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 754),
-    NAME_FUNC_OFFSET(12954, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 755),
-    NAME_FUNC_OFFSET(12974, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 756),
-    NAME_FUNC_OFFSET(12992, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 757),
-    NAME_FUNC_OFFSET(13011, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 758),
-    NAME_FUNC_OFFSET(13029, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(13048, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 760),
-    NAME_FUNC_OFFSET(13066, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 761),
-    NAME_FUNC_OFFSET(13085, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 762),
-    NAME_FUNC_OFFSET(13103, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 763),
-    NAME_FUNC_OFFSET(13122, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 764),
-    NAME_FUNC_OFFSET(13140, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 765),
-    NAME_FUNC_OFFSET(13159, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 766),
-    NAME_FUNC_OFFSET(13177, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(13196, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 768),
-    NAME_FUNC_OFFSET(13214, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 769),
-    NAME_FUNC_OFFSET(13233, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 770),
-    NAME_FUNC_OFFSET(13251, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 771),
-    NAME_FUNC_OFFSET(13270, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 772),
-    NAME_FUNC_OFFSET(13288, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 773),
-    NAME_FUNC_OFFSET(13307, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 774),
-    NAME_FUNC_OFFSET(13325, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 775),
-    NAME_FUNC_OFFSET(13344, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 776),
-    NAME_FUNC_OFFSET(13362, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 777),
-    NAME_FUNC_OFFSET(13381, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 778),
-    NAME_FUNC_OFFSET(13399, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 779),
-    NAME_FUNC_OFFSET(13418, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, 780),
-    NAME_FUNC_OFFSET(13443, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, 781),
-    NAME_FUNC_OFFSET(13470, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
-    NAME_FUNC_OFFSET(13487, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
-    NAME_FUNC_OFFSET(13503, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, 784),
-    NAME_FUNC_OFFSET(13517, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, 785),
-    NAME_FUNC_OFFSET(13532, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, 786),
-    NAME_FUNC_OFFSET(13544, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, 787),
-    NAME_FUNC_OFFSET(13557, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, 788),
-    NAME_FUNC_OFFSET(13571, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 789),
-    NAME_FUNC_OFFSET(13595, glBindProgramNV, glBindProgramNV, NULL, 790),
-    NAME_FUNC_OFFSET(13611, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 791),
-    NAME_FUNC_OFFSET(13630, glExecuteProgramNV, glExecuteProgramNV, NULL, 792),
-    NAME_FUNC_OFFSET(13649, glGenProgramsNV, glGenProgramsNV, NULL, 793),
-    NAME_FUNC_OFFSET(13665, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 794),
-    NAME_FUNC_OFFSET(13691, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 795),
-    NAME_FUNC_OFFSET(13717, glGetProgramStringNV, glGetProgramStringNV, NULL, 796),
-    NAME_FUNC_OFFSET(13738, glGetProgramivNV, glGetProgramivNV, NULL, 797),
-    NAME_FUNC_OFFSET(13755, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 798),
-    NAME_FUNC_OFFSET(13776, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 799),
-    NAME_FUNC_OFFSET(13804, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 800),
-    NAME_FUNC_OFFSET(13826, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 801),
-    NAME_FUNC_OFFSET(13848, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 802),
-    NAME_FUNC_OFFSET(13870, glIsProgramNV, glIsProgramNV, NULL, 803),
-    NAME_FUNC_OFFSET(13884, glLoadProgramNV, glLoadProgramNV, NULL, 804),
-    NAME_FUNC_OFFSET(13900, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 805),
-    NAME_FUNC_OFFSET(13925, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 806),
-    NAME_FUNC_OFFSET(13950, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 807),
-    NAME_FUNC_OFFSET(13978, glTrackMatrixNV, glTrackMatrixNV, NULL, 808),
-    NAME_FUNC_OFFSET(13994, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 809),
-    NAME_FUNC_OFFSET(14013, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 810),
-    NAME_FUNC_OFFSET(14033, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 811),
-    NAME_FUNC_OFFSET(14052, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 812),
-    NAME_FUNC_OFFSET(14072, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 813),
-    NAME_FUNC_OFFSET(14091, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 814),
-    NAME_FUNC_OFFSET(14111, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 815),
-    NAME_FUNC_OFFSET(14130, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 816),
-    NAME_FUNC_OFFSET(14150, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 817),
-    NAME_FUNC_OFFSET(14169, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 818),
-    NAME_FUNC_OFFSET(14189, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 819),
-    NAME_FUNC_OFFSET(14208, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 820),
-    NAME_FUNC_OFFSET(14228, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 821),
-    NAME_FUNC_OFFSET(14247, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 822),
-    NAME_FUNC_OFFSET(14267, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 823),
-    NAME_FUNC_OFFSET(14286, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 824),
-    NAME_FUNC_OFFSET(14306, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 825),
-    NAME_FUNC_OFFSET(14325, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 826),
-    NAME_FUNC_OFFSET(14345, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 827),
-    NAME_FUNC_OFFSET(14364, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 828),
-    NAME_FUNC_OFFSET(14384, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 829),
-    NAME_FUNC_OFFSET(14403, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 830),
-    NAME_FUNC_OFFSET(14423, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 831),
-    NAME_FUNC_OFFSET(14442, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 832),
-    NAME_FUNC_OFFSET(14462, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 833),
-    NAME_FUNC_OFFSET(14482, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 834),
-    NAME_FUNC_OFFSET(14503, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 835),
-    NAME_FUNC_OFFSET(14527, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 836),
-    NAME_FUNC_OFFSET(14548, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 837),
-    NAME_FUNC_OFFSET(14569, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 838),
-    NAME_FUNC_OFFSET(14590, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 839),
-    NAME_FUNC_OFFSET(14611, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 840),
-    NAME_FUNC_OFFSET(14632, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 841),
-    NAME_FUNC_OFFSET(14653, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 842),
-    NAME_FUNC_OFFSET(14674, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 843),
-    NAME_FUNC_OFFSET(14695, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 844),
-    NAME_FUNC_OFFSET(14716, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 845),
-    NAME_FUNC_OFFSET(14737, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 846),
-    NAME_FUNC_OFFSET(14758, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 847),
-    NAME_FUNC_OFFSET(14779, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 848),
-    NAME_FUNC_OFFSET(14801, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 849),
-    NAME_FUNC_OFFSET(14828, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 850),
-    NAME_FUNC_OFFSET(14855, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 851),
-    NAME_FUNC_OFFSET(14879, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 852),
-    NAME_FUNC_OFFSET(14903, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 853),
-    NAME_FUNC_OFFSET(14925, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 854),
-    NAME_FUNC_OFFSET(14947, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 855),
-    NAME_FUNC_OFFSET(14969, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 856),
-    NAME_FUNC_OFFSET(14994, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 857),
-    NAME_FUNC_OFFSET(15018, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 858),
-    NAME_FUNC_OFFSET(15040, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 859),
-    NAME_FUNC_OFFSET(15062, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 860),
-    NAME_FUNC_OFFSET(15084, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 861),
-    NAME_FUNC_OFFSET(15110, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 862),
-    NAME_FUNC_OFFSET(15133, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 863),
-    NAME_FUNC_OFFSET(15157, glPassTexCoordATI, glPassTexCoordATI, NULL, 864),
-    NAME_FUNC_OFFSET(15175, glSampleMapATI, glSampleMapATI, NULL, 865),
-    NAME_FUNC_OFFSET(15190, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 866),
-    NAME_FUNC_OFFSET(15221, glPointParameteriNV, glPointParameteriNV, NULL, 867),
-    NAME_FUNC_OFFSET(15241, glPointParameterivNV, glPointParameterivNV, NULL, 868),
-    NAME_FUNC_OFFSET(15262, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL, 869),
-    NAME_FUNC_OFFSET(15285, gl_dispatch_stub_870, gl_dispatch_stub_870, NULL, 870),
-    NAME_FUNC_OFFSET(15308, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
+    NAME_FUNC_OFFSET( 9751, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 601),
+    NAME_FUNC_OFFSET( 9781, glGetFragDataIndex, glGetFragDataIndex, NULL, 602),
+    NAME_FUNC_OFFSET( 9800, glBindSampler, glBindSampler, NULL, 603),
+    NAME_FUNC_OFFSET( 9814, glDeleteSamplers, glDeleteSamplers, NULL, 604),
+    NAME_FUNC_OFFSET( 9831, glGenSamplers, glGenSamplers, NULL, 605),
+    NAME_FUNC_OFFSET( 9845, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 606),
+    NAME_FUNC_OFFSET( 9870, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 607),
+    NAME_FUNC_OFFSET( 9896, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 608),
+    NAME_FUNC_OFFSET( 9920, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 609),
+    NAME_FUNC_OFFSET( 9944, glIsSampler, glIsSampler, NULL, 610),
+    NAME_FUNC_OFFSET( 9956, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 611),
+    NAME_FUNC_OFFSET( 9978, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 612),
+    NAME_FUNC_OFFSET(10001, glSamplerParameterf, glSamplerParameterf, NULL, 613),
+    NAME_FUNC_OFFSET(10021, glSamplerParameterfv, glSamplerParameterfv, NULL, 614),
+    NAME_FUNC_OFFSET(10042, glSamplerParameteri, glSamplerParameteri, NULL, 615),
+    NAME_FUNC_OFFSET(10062, glSamplerParameteriv, glSamplerParameteriv, NULL, 616),
+    NAME_FUNC_OFFSET(10083, glColorP3ui, glColorP3ui, NULL, 617),
+    NAME_FUNC_OFFSET(10095, glColorP3uiv, glColorP3uiv, NULL, 618),
+    NAME_FUNC_OFFSET(10108, glColorP4ui, glColorP4ui, NULL, 619),
+    NAME_FUNC_OFFSET(10120, glColorP4uiv, glColorP4uiv, NULL, 620),
+    NAME_FUNC_OFFSET(10133, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 621),
+    NAME_FUNC_OFFSET(10153, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 622),
+    NAME_FUNC_OFFSET(10174, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 623),
+    NAME_FUNC_OFFSET(10194, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 624),
+    NAME_FUNC_OFFSET(10215, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 625),
+    NAME_FUNC_OFFSET(10235, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 626),
+    NAME_FUNC_OFFSET(10256, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 627),
+    NAME_FUNC_OFFSET(10276, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 628),
+    NAME_FUNC_OFFSET(10297, glNormalP3ui, glNormalP3ui, NULL, 629),
+    NAME_FUNC_OFFSET(10310, glNormalP3uiv, glNormalP3uiv, NULL, 630),
+    NAME_FUNC_OFFSET(10324, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 631),
+    NAME_FUNC_OFFSET(10345, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 632),
+    NAME_FUNC_OFFSET(10367, glTexCoordP1ui, glTexCoordP1ui, NULL, 633),
+    NAME_FUNC_OFFSET(10382, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 634),
+    NAME_FUNC_OFFSET(10398, glTexCoordP2ui, glTexCoordP2ui, NULL, 635),
+    NAME_FUNC_OFFSET(10413, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 636),
+    NAME_FUNC_OFFSET(10429, glTexCoordP3ui, glTexCoordP3ui, NULL, 637),
+    NAME_FUNC_OFFSET(10444, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 638),
+    NAME_FUNC_OFFSET(10460, glTexCoordP4ui, glTexCoordP4ui, NULL, 639),
+    NAME_FUNC_OFFSET(10475, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 640),
+    NAME_FUNC_OFFSET(10491, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 641),
+    NAME_FUNC_OFFSET(10510, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 642),
+    NAME_FUNC_OFFSET(10530, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 643),
+    NAME_FUNC_OFFSET(10549, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 644),
+    NAME_FUNC_OFFSET(10569, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 645),
+    NAME_FUNC_OFFSET(10588, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 646),
+    NAME_FUNC_OFFSET(10608, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 647),
+    NAME_FUNC_OFFSET(10627, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 648),
+    NAME_FUNC_OFFSET(10647, glVertexP2ui, glVertexP2ui, NULL, 649),
+    NAME_FUNC_OFFSET(10660, glVertexP2uiv, glVertexP2uiv, NULL, 650),
+    NAME_FUNC_OFFSET(10674, glVertexP3ui, glVertexP3ui, NULL, 651),
+    NAME_FUNC_OFFSET(10687, glVertexP3uiv, glVertexP3uiv, NULL, 652),
+    NAME_FUNC_OFFSET(10701, glVertexP4ui, glVertexP4ui, NULL, 653),
+    NAME_FUNC_OFFSET(10714, glVertexP4uiv, glVertexP4uiv, NULL, 654),
+    NAME_FUNC_OFFSET(10728, glBindTransformFeedback, glBindTransformFeedback, NULL, 655),
+    NAME_FUNC_OFFSET(10752, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 656),
+    NAME_FUNC_OFFSET(10779, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 657),
+    NAME_FUNC_OFFSET(10803, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 658),
+    NAME_FUNC_OFFSET(10827, glIsTransformFeedback, glIsTransformFeedback, NULL, 659),
+    NAME_FUNC_OFFSET(10849, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 660),
+    NAME_FUNC_OFFSET(10874, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 661),
+    NAME_FUNC_OFFSET(10900, glClearDepthf, glClearDepthf, NULL, 662),
+    NAME_FUNC_OFFSET(10914, glDepthRangef, glDepthRangef, NULL, 663),
+    NAME_FUNC_OFFSET(10928, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 664),
+    NAME_FUNC_OFFSET(10955, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 665),
+    NAME_FUNC_OFFSET(10979, glShaderBinary, glShaderBinary, NULL, 666),
+    NAME_FUNC_OFFSET(10994, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 667),
+    NAME_FUNC_OFFSET(11020, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 668),
+    NAME_FUNC_OFFSET(11045, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 669),
+    NAME_FUNC_OFFSET(11069, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 670),
+    NAME_FUNC_OFFSET(11093, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 671),
+    NAME_FUNC_OFFSET(11121, glGetnColorTableARB, glGetnColorTableARB, NULL, 672),
+    NAME_FUNC_OFFSET(11141, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 673),
+    NAME_FUNC_OFFSET(11169, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 674),
+    NAME_FUNC_OFFSET(11196, glGetnHistogramARB, glGetnHistogramARB, NULL, 675),
+    NAME_FUNC_OFFSET(11215, glGetnMapdvARB, glGetnMapdvARB, NULL, 676),
+    NAME_FUNC_OFFSET(11230, glGetnMapfvARB, glGetnMapfvARB, NULL, 677),
+    NAME_FUNC_OFFSET(11245, glGetnMapivARB, glGetnMapivARB, NULL, 678),
+    NAME_FUNC_OFFSET(11260, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 679),
+    NAME_FUNC_OFFSET(11276, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 680),
+    NAME_FUNC_OFFSET(11296, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 681),
+    NAME_FUNC_OFFSET(11317, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 682),
+    NAME_FUNC_OFFSET(11338, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 683),
+    NAME_FUNC_OFFSET(11362, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 684),
+    NAME_FUNC_OFFSET(11387, glGetnTexImageARB, glGetnTexImageARB, NULL, 685),
+    NAME_FUNC_OFFSET(11405, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 686),
+    NAME_FUNC_OFFSET(11424, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 687),
+    NAME_FUNC_OFFSET(11443, glGetnUniformivARB, glGetnUniformivARB, NULL, 688),
+    NAME_FUNC_OFFSET(11462, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 689),
+    NAME_FUNC_OFFSET(11482, glReadnPixelsARB, glReadnPixelsARB, NULL, 690),
+    NAME_FUNC_OFFSET(11499, glTexStorage1D, glTexStorage1D, NULL, 691),
+    NAME_FUNC_OFFSET(11514, glTexStorage2D, glTexStorage2D, NULL, 692),
+    NAME_FUNC_OFFSET(11529, glTexStorage3D, glTexStorage3D, NULL, 693),
+    NAME_FUNC_OFFSET(11544, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 694),
+    NAME_FUNC_OFFSET(11566, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 695),
+    NAME_FUNC_OFFSET(11588, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 696),
+    NAME_FUNC_OFFSET(11610, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 697),
+    NAME_FUNC_OFFSET(11629, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
+    NAME_FUNC_OFFSET(11661, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
+    NAME_FUNC_OFFSET(11693, gl_dispatch_stub_700, gl_dispatch_stub_700, NULL, 700),
+    NAME_FUNC_OFFSET(11721, gl_dispatch_stub_701, gl_dispatch_stub_701, NULL, 701),
+    NAME_FUNC_OFFSET(11750, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
+    NAME_FUNC_OFFSET(11778, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
+    NAME_FUNC_OFFSET(11807, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
+    NAME_FUNC_OFFSET(11824, gl_dispatch_stub_705, gl_dispatch_stub_705, NULL, 705),
+    NAME_FUNC_OFFSET(11844, glColorPointerEXT, glColorPointerEXT, NULL, 706),
+    NAME_FUNC_OFFSET(11862, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 707),
+    NAME_FUNC_OFFSET(11883, glIndexPointerEXT, glIndexPointerEXT, NULL, 708),
+    NAME_FUNC_OFFSET(11901, glNormalPointerEXT, glNormalPointerEXT, NULL, 709),
+    NAME_FUNC_OFFSET(11920, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 710),
+    NAME_FUNC_OFFSET(11941, glVertexPointerEXT, glVertexPointerEXT, NULL, 711),
+    NAME_FUNC_OFFSET(11960, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
+    NAME_FUNC_OFFSET(11981, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
+    NAME_FUNC_OFFSET(12003, glLockArraysEXT, glLockArraysEXT, NULL, 714),
+    NAME_FUNC_OFFSET(12019, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 715),
+    NAME_FUNC_OFFSET(12037, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 716),
+    NAME_FUNC_OFFSET(12059, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 717),
+    NAME_FUNC_OFFSET(12082, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 718),
+    NAME_FUNC_OFFSET(12104, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 719),
+    NAME_FUNC_OFFSET(12127, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 720),
+    NAME_FUNC_OFFSET(12149, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 721),
+    NAME_FUNC_OFFSET(12172, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 722),
+    NAME_FUNC_OFFSET(12194, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 723),
+    NAME_FUNC_OFFSET(12217, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 724),
+    NAME_FUNC_OFFSET(12239, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 725),
+    NAME_FUNC_OFFSET(12262, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 726),
+    NAME_FUNC_OFFSET(12285, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 727),
+    NAME_FUNC_OFFSET(12309, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 728),
+    NAME_FUNC_OFFSET(12332, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 729),
+    NAME_FUNC_OFFSET(12356, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 730),
+    NAME_FUNC_OFFSET(12379, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 731),
+    NAME_FUNC_OFFSET(12403, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 732),
+    NAME_FUNC_OFFSET(12430, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 733),
+    NAME_FUNC_OFFSET(12451, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 734),
+    NAME_FUNC_OFFSET(12474, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 735),
+    NAME_FUNC_OFFSET(12495, glFogCoorddEXT, glFogCoorddEXT, NULL, 736),
+    NAME_FUNC_OFFSET(12510, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 737),
+    NAME_FUNC_OFFSET(12526, glFogCoordfEXT, glFogCoordfEXT, NULL, 738),
+    NAME_FUNC_OFFSET(12541, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 739),
+    NAME_FUNC_OFFSET(12557, gl_dispatch_stub_740, gl_dispatch_stub_740, NULL, 740),
+    NAME_FUNC_OFFSET(12575, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 741),
+    NAME_FUNC_OFFSET(12598, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 742),
+    NAME_FUNC_OFFSET(12624, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 743),
+    NAME_FUNC_OFFSET(12645, glCombinerInputNV, glCombinerInputNV, NULL, 744),
+    NAME_FUNC_OFFSET(12663, glCombinerOutputNV, glCombinerOutputNV, NULL, 745),
+    NAME_FUNC_OFFSET(12682, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 746),
+    NAME_FUNC_OFFSET(12705, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 747),
+    NAME_FUNC_OFFSET(12729, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 748),
+    NAME_FUNC_OFFSET(12752, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 749),
+    NAME_FUNC_OFFSET(12776, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 750),
+    NAME_FUNC_OFFSET(12799, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 751),
+    NAME_FUNC_OFFSET(12831, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 752),
+    NAME_FUNC_OFFSET(12863, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 753),
+    NAME_FUNC_OFFSET(12896, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 754),
+    NAME_FUNC_OFFSET(12929, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 755),
+    NAME_FUNC_OFFSET(12966, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 756),
+    NAME_FUNC_OFFSET(13003, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 757),
+    NAME_FUNC_OFFSET(13023, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
+    NAME_FUNC_OFFSET(13041, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
+    NAME_FUNC_OFFSET(13060, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
+    NAME_FUNC_OFFSET(13078, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
+    NAME_FUNC_OFFSET(13097, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
+    NAME_FUNC_OFFSET(13115, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
+    NAME_FUNC_OFFSET(13134, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
+    NAME_FUNC_OFFSET(13152, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
+    NAME_FUNC_OFFSET(13171, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
+    NAME_FUNC_OFFSET(13189, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
+    NAME_FUNC_OFFSET(13208, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
+    NAME_FUNC_OFFSET(13226, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
+    NAME_FUNC_OFFSET(13245, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
+    NAME_FUNC_OFFSET(13263, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
+    NAME_FUNC_OFFSET(13282, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
+    NAME_FUNC_OFFSET(13300, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
+    NAME_FUNC_OFFSET(13319, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 774),
+    NAME_FUNC_OFFSET(13337, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 775),
+    NAME_FUNC_OFFSET(13356, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 776),
+    NAME_FUNC_OFFSET(13374, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 777),
+    NAME_FUNC_OFFSET(13393, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 778),
+    NAME_FUNC_OFFSET(13411, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 779),
+    NAME_FUNC_OFFSET(13430, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 780),
+    NAME_FUNC_OFFSET(13448, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 781),
+    NAME_FUNC_OFFSET(13467, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
+    NAME_FUNC_OFFSET(13492, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
+    NAME_FUNC_OFFSET(13519, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, 784),
+    NAME_FUNC_OFFSET(13536, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, 785),
+    NAME_FUNC_OFFSET(13552, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, 786),
+    NAME_FUNC_OFFSET(13566, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, 787),
+    NAME_FUNC_OFFSET(13581, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, 788),
+    NAME_FUNC_OFFSET(13593, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, 789),
+    NAME_FUNC_OFFSET(13606, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, 790),
+    NAME_FUNC_OFFSET(13620, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 791),
+    NAME_FUNC_OFFSET(13644, glBindProgramNV, glBindProgramNV, NULL, 792),
+    NAME_FUNC_OFFSET(13660, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 793),
+    NAME_FUNC_OFFSET(13679, glExecuteProgramNV, glExecuteProgramNV, NULL, 794),
+    NAME_FUNC_OFFSET(13698, glGenProgramsNV, glGenProgramsNV, NULL, 795),
+    NAME_FUNC_OFFSET(13714, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 796),
+    NAME_FUNC_OFFSET(13740, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 797),
+    NAME_FUNC_OFFSET(13766, glGetProgramStringNV, glGetProgramStringNV, NULL, 798),
+    NAME_FUNC_OFFSET(13787, glGetProgramivNV, glGetProgramivNV, NULL, 799),
+    NAME_FUNC_OFFSET(13804, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 800),
+    NAME_FUNC_OFFSET(13825, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 801),
+    NAME_FUNC_OFFSET(13853, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 802),
+    NAME_FUNC_OFFSET(13875, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 803),
+    NAME_FUNC_OFFSET(13897, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 804),
+    NAME_FUNC_OFFSET(13919, glIsProgramNV, glIsProgramNV, NULL, 805),
+    NAME_FUNC_OFFSET(13933, glLoadProgramNV, glLoadProgramNV, NULL, 806),
+    NAME_FUNC_OFFSET(13949, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 807),
+    NAME_FUNC_OFFSET(13974, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 808),
+    NAME_FUNC_OFFSET(13999, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 809),
+    NAME_FUNC_OFFSET(14027, glTrackMatrixNV, glTrackMatrixNV, NULL, 810),
+    NAME_FUNC_OFFSET(14043, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 811),
+    NAME_FUNC_OFFSET(14062, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 812),
+    NAME_FUNC_OFFSET(14082, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 813),
+    NAME_FUNC_OFFSET(14101, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 814),
+    NAME_FUNC_OFFSET(14121, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 815),
+    NAME_FUNC_OFFSET(14140, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 816),
+    NAME_FUNC_OFFSET(14160, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 817),
+    NAME_FUNC_OFFSET(14179, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 818),
+    NAME_FUNC_OFFSET(14199, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 819),
+    NAME_FUNC_OFFSET(14218, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 820),
+    NAME_FUNC_OFFSET(14238, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 821),
+    NAME_FUNC_OFFSET(14257, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 822),
+    NAME_FUNC_OFFSET(14277, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 823),
+    NAME_FUNC_OFFSET(14296, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 824),
+    NAME_FUNC_OFFSET(14316, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 825),
+    NAME_FUNC_OFFSET(14335, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 826),
+    NAME_FUNC_OFFSET(14355, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 827),
+    NAME_FUNC_OFFSET(14374, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 828),
+    NAME_FUNC_OFFSET(14394, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 829),
+    NAME_FUNC_OFFSET(14413, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 830),
+    NAME_FUNC_OFFSET(14433, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 831),
+    NAME_FUNC_OFFSET(14452, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 832),
+    NAME_FUNC_OFFSET(14472, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 833),
+    NAME_FUNC_OFFSET(14491, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 834),
+    NAME_FUNC_OFFSET(14511, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 835),
+    NAME_FUNC_OFFSET(14531, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 836),
+    NAME_FUNC_OFFSET(14552, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 837),
+    NAME_FUNC_OFFSET(14576, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 838),
+    NAME_FUNC_OFFSET(14597, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 839),
+    NAME_FUNC_OFFSET(14618, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 840),
+    NAME_FUNC_OFFSET(14639, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 841),
+    NAME_FUNC_OFFSET(14660, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 842),
+    NAME_FUNC_OFFSET(14681, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 843),
+    NAME_FUNC_OFFSET(14702, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 844),
+    NAME_FUNC_OFFSET(14723, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 845),
+    NAME_FUNC_OFFSET(14744, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 846),
+    NAME_FUNC_OFFSET(14765, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 847),
+    NAME_FUNC_OFFSET(14786, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 848),
+    NAME_FUNC_OFFSET(14807, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 849),
+    NAME_FUNC_OFFSET(14828, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 850),
+    NAME_FUNC_OFFSET(14850, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 851),
+    NAME_FUNC_OFFSET(14877, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 852),
+    NAME_FUNC_OFFSET(14904, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 853),
+    NAME_FUNC_OFFSET(14928, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 854),
+    NAME_FUNC_OFFSET(14952, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 855),
+    NAME_FUNC_OFFSET(14974, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 856),
+    NAME_FUNC_OFFSET(14996, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 857),
+    NAME_FUNC_OFFSET(15018, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 858),
+    NAME_FUNC_OFFSET(15043, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 859),
+    NAME_FUNC_OFFSET(15067, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 860),
+    NAME_FUNC_OFFSET(15089, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 861),
+    NAME_FUNC_OFFSET(15111, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 862),
+    NAME_FUNC_OFFSET(15133, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 863),
+    NAME_FUNC_OFFSET(15159, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 864),
+    NAME_FUNC_OFFSET(15182, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 865),
+    NAME_FUNC_OFFSET(15206, glPassTexCoordATI, glPassTexCoordATI, NULL, 866),
+    NAME_FUNC_OFFSET(15224, glSampleMapATI, glSampleMapATI, NULL, 867),
+    NAME_FUNC_OFFSET(15239, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 868),
+    NAME_FUNC_OFFSET(15270, glPointParameteriNV, glPointParameteriNV, NULL, 869),
+    NAME_FUNC_OFFSET(15290, glPointParameterivNV, glPointParameterivNV, NULL, 870),
+    NAME_FUNC_OFFSET(15311, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
     NAME_FUNC_OFFSET(15334, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
     NAME_FUNC_OFFSET(15357, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
-    NAME_FUNC_OFFSET(15378, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 874),
-    NAME_FUNC_OFFSET(15409, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 875),
-    NAME_FUNC_OFFSET(15440, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 876),
-    NAME_FUNC_OFFSET(15468, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 877),
-    NAME_FUNC_OFFSET(15497, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 878),
-    NAME_FUNC_OFFSET(15525, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 879),
-    NAME_FUNC_OFFSET(15554, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 880),
-    NAME_FUNC_OFFSET(15580, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 881),
-    NAME_FUNC_OFFSET(15601, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
-    NAME_FUNC_OFFSET(15618, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
-    NAME_FUNC_OFFSET(15645, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 884),
-    NAME_FUNC_OFFSET(15666, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(15688, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 886),
-    NAME_FUNC_OFFSET(15716, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 887),
-    NAME_FUNC_OFFSET(15740, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 888),
-    NAME_FUNC_OFFSET(15765, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 889),
-    NAME_FUNC_OFFSET(15794, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 890),
-    NAME_FUNC_OFFSET(15820, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 891),
-    NAME_FUNC_OFFSET(15846, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 892),
-    NAME_FUNC_OFFSET(15872, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15893, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 894),
-    NAME_FUNC_OFFSET(15915, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 895),
-    NAME_FUNC_OFFSET(15935, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 896),
-    NAME_FUNC_OFFSET(15976, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 897),
-    NAME_FUNC_OFFSET(16008, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 898),
-    NAME_FUNC_OFFSET(16027, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 899),
-    NAME_FUNC_OFFSET(16047, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 900),
-    NAME_FUNC_OFFSET(16072, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
-    NAME_FUNC_OFFSET(16093, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
-    NAME_FUNC_OFFSET(16117, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
-    NAME_FUNC_OFFSET(16147, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 904),
-    NAME_FUNC_OFFSET(16173, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 905),
-    NAME_FUNC_OFFSET(16198, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(16217, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 907),
-    NAME_FUNC_OFFSET(16241, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(16266, glUniform1uiEXT, glUniform1uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(16282, glUniform1uivEXT, glUniform1uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(16299, glUniform2uiEXT, glUniform2uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(16315, glUniform2uivEXT, glUniform2uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(16332, glUniform3uiEXT, glUniform3uiEXT, NULL, 913),
-    NAME_FUNC_OFFSET(16348, glUniform3uivEXT, glUniform3uivEXT, NULL, 914),
-    NAME_FUNC_OFFSET(16365, glUniform4uiEXT, glUniform4uiEXT, NULL, 915),
-    NAME_FUNC_OFFSET(16381, glUniform4uivEXT, glUniform4uivEXT, NULL, 916),
-    NAME_FUNC_OFFSET(16398, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 917),
-    NAME_FUNC_OFFSET(16419, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 918),
-    NAME_FUNC_OFFSET(16441, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 919),
-    NAME_FUNC_OFFSET(16463, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 920),
-    NAME_FUNC_OFFSET(16486, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 921),
-    NAME_FUNC_OFFSET(16507, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 922),
-    NAME_FUNC_OFFSET(16529, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 923),
-    NAME_FUNC_OFFSET(16551, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 924),
-    NAME_FUNC_OFFSET(16574, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 925),
-    NAME_FUNC_OFFSET(16595, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 926),
-    NAME_FUNC_OFFSET(16617, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 927),
-    NAME_FUNC_OFFSET(16639, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 928),
-    NAME_FUNC_OFFSET(16662, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 929),
-    NAME_FUNC_OFFSET(16684, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 930),
-    NAME_FUNC_OFFSET(16705, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 931),
-    NAME_FUNC_OFFSET(16727, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 932),
-    NAME_FUNC_OFFSET(16749, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 933),
-    NAME_FUNC_OFFSET(16772, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 934),
-    NAME_FUNC_OFFSET(16794, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 935),
-    NAME_FUNC_OFFSET(16817, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 936),
-    NAME_FUNC_OFFSET(16840, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16866, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 938),
-    NAME_FUNC_OFFSET(16895, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 939),
-    NAME_FUNC_OFFSET(16917, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 940),
-    NAME_FUNC_OFFSET(16937, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16956, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 942),
-    NAME_FUNC_OFFSET(16980, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 943),
-    NAME_FUNC_OFFSET(17004, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 944),
-    NAME_FUNC_OFFSET(17026, glClearColorIiEXT, glClearColorIiEXT, NULL, 945),
-    NAME_FUNC_OFFSET(17044, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 946),
-    NAME_FUNC_OFFSET(17063, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 947),
-    NAME_FUNC_OFFSET(17087, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 948),
-    NAME_FUNC_OFFSET(17112, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 949),
-    NAME_FUNC_OFFSET(17133, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 950),
-    NAME_FUNC_OFFSET(17155, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 951),
-    NAME_FUNC_OFFSET(17182, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 952),
-    NAME_FUNC_OFFSET(17207, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(17235, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 954),
-    NAME_FUNC_OFFSET(17255, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 955),
-    NAME_FUNC_OFFSET(17277, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 956),
-    NAME_FUNC_OFFSET(17298, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 957),
-    NAME_FUNC_OFFSET(17324, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 958),
-    NAME_FUNC_OFFSET(17357, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 959),
-    NAME_FUNC_OFFSET(17388, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 960),
-    NAME_FUNC_OFFSET(17409, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
-    NAME_FUNC_OFFSET(17440, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
-    NAME_FUNC_OFFSET(17460, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 963),
-    NAME_FUNC_OFFSET(17488, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 964),
-    NAME_FUNC_OFFSET(17511, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 965),
-    NAME_FUNC_OFFSET(17536, glActiveProgramEXT, glActiveProgramEXT, NULL, 966),
-    NAME_FUNC_OFFSET(17555, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 967),
-    NAME_FUNC_OFFSET(17580, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 968),
-    NAME_FUNC_OFFSET(17602, glTextureBarrierNV, glTextureBarrierNV, NULL, 969),
-    NAME_FUNC_OFFSET(17621, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
-    NAME_FUNC_OFFSET(17646, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
-    NAME_FUNC_OFFSET(17675, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
-    NAME_FUNC_OFFSET(17706, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
-    NAME_FUNC_OFFSET(17730, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
-    NAME_FUNC_OFFSET(17755, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 975),
-    NAME_FUNC_OFFSET(17794, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 976),
-    NAME_FUNC_OFFSET(17823, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(17841, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(17858, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(17874, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(17899, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(17919, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(17939, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(17962, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(17985, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(18005, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(18022, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(18039, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(18054, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(18078, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(18097, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(18116, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(18132, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(18151, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(18174, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18190, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18206, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(18233, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(18260, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(18280, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18299, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18318, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18348, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18378, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18408, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18438, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(18457, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(18480, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(18505, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(18530, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(18557, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(18585, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(18612, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(18640, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(18669, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(18698, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(18724, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(18755, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(18786, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(18810, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(18833, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(18851, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(18880, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(18909, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(18924, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(18950, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(18976, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(18991, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(19003, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(19023, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(19040, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(19056, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(19075, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(19098, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(19114, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
-    NAME_FUNC_OFFSET(19136, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
-    NAME_FUNC_OFFSET(19154, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
-    NAME_FUNC_OFFSET(19173, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(19191, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(19210, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
-    NAME_FUNC_OFFSET(19228, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
-    NAME_FUNC_OFFSET(19247, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
-    NAME_FUNC_OFFSET(19265, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
-    NAME_FUNC_OFFSET(19284, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
-    NAME_FUNC_OFFSET(19302, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
-    NAME_FUNC_OFFSET(19321, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(19339, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(19358, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
-    NAME_FUNC_OFFSET(19376, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
-    NAME_FUNC_OFFSET(19395, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
-    NAME_FUNC_OFFSET(19413, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
-    NAME_FUNC_OFFSET(19432, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
-    NAME_FUNC_OFFSET(19450, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
-    NAME_FUNC_OFFSET(19469, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(19487, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(19506, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
-    NAME_FUNC_OFFSET(19524, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
-    NAME_FUNC_OFFSET(19543, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
-    NAME_FUNC_OFFSET(19561, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
-    NAME_FUNC_OFFSET(19580, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
-    NAME_FUNC_OFFSET(19598, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
-    NAME_FUNC_OFFSET(19617, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(19635, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(19654, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
-    NAME_FUNC_OFFSET(19672, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
-    NAME_FUNC_OFFSET(19691, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
-    NAME_FUNC_OFFSET(19709, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
-    NAME_FUNC_OFFSET(19728, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(19751, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET(19774, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET(19797, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET(19820, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET(19843, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET(19860, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET(19883, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET(19906, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET(19929, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(19955, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(19981, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(20007, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(20031, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(20058, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(20084, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
-    NAME_FUNC_OFFSET(20104, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
-    NAME_FUNC_OFFSET(20124, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
-    NAME_FUNC_OFFSET(20144, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(20167, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(20191, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(20214, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(20238, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET(20255, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
-    NAME_FUNC_OFFSET(20273, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET(20290, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
-    NAME_FUNC_OFFSET(20308, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET(20325, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
-    NAME_FUNC_OFFSET(20343, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET(20360, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
-    NAME_FUNC_OFFSET(20378, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET(20395, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
-    NAME_FUNC_OFFSET(20413, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET(20430, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
-    NAME_FUNC_OFFSET(20448, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET(20465, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
-    NAME_FUNC_OFFSET(20483, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET(20500, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
-    NAME_FUNC_OFFSET(20518, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET(20535, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
-    NAME_FUNC_OFFSET(20553, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
-    NAME_FUNC_OFFSET(20572, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
-    NAME_FUNC_OFFSET(20591, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
-    NAME_FUNC_OFFSET(20610, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
-    NAME_FUNC_OFFSET(20629, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
-    NAME_FUNC_OFFSET(20649, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
-    NAME_FUNC_OFFSET(20669, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
-    NAME_FUNC_OFFSET(20689, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
-    NAME_FUNC_OFFSET(20707, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET(20724, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
-    NAME_FUNC_OFFSET(20742, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET(20759, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
-    NAME_FUNC_OFFSET(20777, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
-    NAME_FUNC_OFFSET(20795, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET(20812, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
-    NAME_FUNC_OFFSET(20830, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
-    NAME_FUNC_OFFSET(20849, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
-    NAME_FUNC_OFFSET(20868, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
-    NAME_FUNC_OFFSET(20887, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
-    NAME_FUNC_OFFSET(20909, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(20922, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(20935, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(20951, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(20967, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(20980, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET(21003, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
-    NAME_FUNC_OFFSET(21023, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
-    NAME_FUNC_OFFSET(21042, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(21053, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(21065, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(21079, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(21092, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(21108, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(21119, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(21132, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
-    NAME_FUNC_OFFSET(21151, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
-    NAME_FUNC_OFFSET(21171, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(21184, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(21194, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(21210, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
-    NAME_FUNC_OFFSET(21229, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
-    NAME_FUNC_OFFSET(21247, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
-    NAME_FUNC_OFFSET(21268, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(21283, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(21298, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(21312, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(21327, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(21339, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(21352, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(21364, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(21377, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(21389, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(21402, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(21414, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(21427, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(21439, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(21452, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(21464, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(21477, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(21489, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(21502, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(21514, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(21527, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
-    NAME_FUNC_OFFSET(21546, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
-    NAME_FUNC_OFFSET(21565, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
-    NAME_FUNC_OFFSET(21584, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
-    NAME_FUNC_OFFSET(21597, glValidateProgramARB, glValidateProgramARB, NULL, 567),
-    NAME_FUNC_OFFSET(21615, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
-    NAME_FUNC_OFFSET(21636, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
-    NAME_FUNC_OFFSET(21654, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
-    NAME_FUNC_OFFSET(21674, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21688, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21705, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21721, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21746, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21768, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21795, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21819, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(21855, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(21889, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
-    NAME_FUNC_OFFSET(21915, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
-    NAME_FUNC_OFFSET(21945, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(21967, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
-    NAME_FUNC_OFFSET(21983, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
-    NAME_FUNC_OFFSET(22002, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
-    NAME_FUNC_OFFSET(22020, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
-    NAME_FUNC_OFFSET(22041, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
-    NAME_FUNC_OFFSET(22063, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
-    NAME_FUNC_OFFSET(22082, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
-    NAME_FUNC_OFFSET(22104, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
-    NAME_FUNC_OFFSET(22127, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 714),
-    NAME_FUNC_OFFSET(22146, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 715),
-    NAME_FUNC_OFFSET(22166, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 716),
-    NAME_FUNC_OFFSET(22185, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 717),
-    NAME_FUNC_OFFSET(22205, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 718),
-    NAME_FUNC_OFFSET(22224, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 719),
-    NAME_FUNC_OFFSET(22244, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 720),
-    NAME_FUNC_OFFSET(22263, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 721),
-    NAME_FUNC_OFFSET(22283, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 722),
-    NAME_FUNC_OFFSET(22302, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 723),
-    NAME_FUNC_OFFSET(22322, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 724),
-    NAME_FUNC_OFFSET(22342, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 725),
-    NAME_FUNC_OFFSET(22363, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 726),
-    NAME_FUNC_OFFSET(22383, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 727),
-    NAME_FUNC_OFFSET(22404, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 728),
-    NAME_FUNC_OFFSET(22424, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 729),
-    NAME_FUNC_OFFSET(22445, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 730),
-    NAME_FUNC_OFFSET(22469, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 731),
-    NAME_FUNC_OFFSET(22487, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 732),
-    NAME_FUNC_OFFSET(22507, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 733),
-    NAME_FUNC_OFFSET(22525, glFogCoorddEXT, glFogCoorddEXT, NULL, 734),
-    NAME_FUNC_OFFSET(22537, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 735),
-    NAME_FUNC_OFFSET(22550, glFogCoordfEXT, glFogCoordfEXT, NULL, 736),
-    NAME_FUNC_OFFSET(22562, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 737),
-    NAME_FUNC_OFFSET(22575, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 739),
-    NAME_FUNC_OFFSET(22595, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 739),
-    NAME_FUNC_OFFSET(22619, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22633, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22650, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22665, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22683, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22697, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22714, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22729, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22747, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22761, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22778, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22793, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22811, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22825, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22842, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22857, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22875, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22889, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22906, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22921, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22939, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22953, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22970, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(22985, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23003, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 768),
-    NAME_FUNC_OFFSET(23017, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 768),
-    NAME_FUNC_OFFSET(23034, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 769),
-    NAME_FUNC_OFFSET(23049, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 769),
-    NAME_FUNC_OFFSET(23067, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 770),
-    NAME_FUNC_OFFSET(23081, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 770),
-    NAME_FUNC_OFFSET(23098, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 771),
-    NAME_FUNC_OFFSET(23113, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 771),
-    NAME_FUNC_OFFSET(23131, glBindProgramNV, glBindProgramNV, NULL, 790),
-    NAME_FUNC_OFFSET(23148, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 791),
-    NAME_FUNC_OFFSET(23168, glGenProgramsNV, glGenProgramsNV, NULL, 793),
-    NAME_FUNC_OFFSET(23185, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 799),
-    NAME_FUNC_OFFSET(23211, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 799),
-    NAME_FUNC_OFFSET(23240, glIsProgramNV, glIsProgramNV, NULL, 803),
-    NAME_FUNC_OFFSET(23255, glPointParameteriNV, glPointParameteriNV, NULL, 867),
-    NAME_FUNC_OFFSET(23273, glPointParameterivNV, glPointParameterivNV, NULL, 868),
-    NAME_FUNC_OFFSET(23292, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
-    NAME_FUNC_OFFSET(23313, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
-    NAME_FUNC_OFFSET(23329, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 880),
-    NAME_FUNC_OFFSET(23353, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
-    NAME_FUNC_OFFSET(23377, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
-    NAME_FUNC_OFFSET(23404, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 884),
-    NAME_FUNC_OFFSET(23422, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(23441, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 886),
-    NAME_FUNC_OFFSET(23466, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 887),
-    NAME_FUNC_OFFSET(23487, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 888),
-    NAME_FUNC_OFFSET(23509, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 889),
-    NAME_FUNC_OFFSET(23535, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 890),
-    NAME_FUNC_OFFSET(23558, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 891),
-    NAME_FUNC_OFFSET(23581, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 892),
-    NAME_FUNC_OFFSET(23604, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 893),
-    NAME_FUNC_OFFSET(23622, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 894),
-    NAME_FUNC_OFFSET(23641, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 895),
-    NAME_FUNC_OFFSET(23658, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 896),
-    NAME_FUNC_OFFSET(23696, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 897),
-    NAME_FUNC_OFFSET(23725, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 898),
-    NAME_FUNC_OFFSET(23741, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 899),
-    NAME_FUNC_OFFSET(23758, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 900),
-    NAME_FUNC_OFFSET(23780, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
-    NAME_FUNC_OFFSET(23798, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 904),
-    NAME_FUNC_OFFSET(23821, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 905),
-    NAME_FUNC_OFFSET(23843, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(23859, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 907),
-    NAME_FUNC_OFFSET(23880, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(23902, glUniform1uiEXT, glUniform1uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(23915, glUniform1uivEXT, glUniform1uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(23929, glUniform2uiEXT, glUniform2uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(23942, glUniform2uivEXT, glUniform2uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(23956, glUniform3uiEXT, glUniform3uiEXT, NULL, 913),
-    NAME_FUNC_OFFSET(23969, glUniform3uivEXT, glUniform3uivEXT, NULL, 914),
-    NAME_FUNC_OFFSET(23983, glUniform4uiEXT, glUniform4uiEXT, NULL, 915),
-    NAME_FUNC_OFFSET(23996, glUniform4uivEXT, glUniform4uivEXT, NULL, 916),
-    NAME_FUNC_OFFSET(24010, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 917),
-    NAME_FUNC_OFFSET(24028, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 918),
-    NAME_FUNC_OFFSET(24047, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 919),
-    NAME_FUNC_OFFSET(24066, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 920),
-    NAME_FUNC_OFFSET(24086, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 921),
-    NAME_FUNC_OFFSET(24104, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 922),
-    NAME_FUNC_OFFSET(24123, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 923),
-    NAME_FUNC_OFFSET(24142, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 924),
-    NAME_FUNC_OFFSET(24162, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 925),
-    NAME_FUNC_OFFSET(24180, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 926),
-    NAME_FUNC_OFFSET(24199, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 927),
-    NAME_FUNC_OFFSET(24218, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 928),
-    NAME_FUNC_OFFSET(24238, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 929),
-    NAME_FUNC_OFFSET(24257, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 930),
-    NAME_FUNC_OFFSET(24275, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 931),
-    NAME_FUNC_OFFSET(24294, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 932),
-    NAME_FUNC_OFFSET(24313, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24333, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24352, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 935),
-    NAME_FUNC_OFFSET(24372, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 936),
-    NAME_FUNC_OFFSET(24392, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 937),
-    NAME_FUNC_OFFSET(24415, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 938),
-    NAME_FUNC_OFFSET(24441, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 938),
-    NAME_FUNC_OFFSET(24470, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 939),
-    NAME_FUNC_OFFSET(24483, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 940),
-    NAME_FUNC_OFFSET(24494, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 941),
-    NAME_FUNC_OFFSET(24504, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 942),
-    NAME_FUNC_OFFSET(24520, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 943),
-    NAME_FUNC_OFFSET(24536, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 944),
-    NAME_FUNC_OFFSET(24549, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 947),
-    NAME_FUNC_OFFSET(24570, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 948),
-    NAME_FUNC_OFFSET(24592, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 949),
-    NAME_FUNC_OFFSET(24610, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 950),
-    NAME_FUNC_OFFSET(24629, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 951),
-    NAME_FUNC_OFFSET(24654, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 952),
-    NAME_FUNC_OFFSET(24677, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(24702, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 954),
-    NAME_FUNC_OFFSET(24719, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 956),
-    NAME_FUNC_OFFSET(24737, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 957),
-    NAME_FUNC_OFFSET(24760, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 958),
-    NAME_FUNC_OFFSET(24790, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 959),
-    NAME_FUNC_OFFSET(24818, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 960),
+    NAME_FUNC_OFFSET(15383, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
+    NAME_FUNC_OFFSET(15406, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
+    NAME_FUNC_OFFSET(15427, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 876),
+    NAME_FUNC_OFFSET(15458, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 877),
+    NAME_FUNC_OFFSET(15489, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 878),
+    NAME_FUNC_OFFSET(15517, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 879),
+    NAME_FUNC_OFFSET(15546, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 880),
+    NAME_FUNC_OFFSET(15574, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 881),
+    NAME_FUNC_OFFSET(15603, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 882),
+    NAME_FUNC_OFFSET(15629, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 883),
+    NAME_FUNC_OFFSET(15650, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),
+    NAME_FUNC_OFFSET(15667, gl_dispatch_stub_885, gl_dispatch_stub_885, NULL, 885),
+    NAME_FUNC_OFFSET(15694, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 886),
+    NAME_FUNC_OFFSET(15715, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 887),
+    NAME_FUNC_OFFSET(15737, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 888),
+    NAME_FUNC_OFFSET(15765, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 889),
+    NAME_FUNC_OFFSET(15789, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 890),
+    NAME_FUNC_OFFSET(15814, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 891),
+    NAME_FUNC_OFFSET(15843, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 892),
+    NAME_FUNC_OFFSET(15869, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 893),
+    NAME_FUNC_OFFSET(15895, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 894),
+    NAME_FUNC_OFFSET(15921, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 895),
+    NAME_FUNC_OFFSET(15942, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 896),
+    NAME_FUNC_OFFSET(15964, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 897),
+    NAME_FUNC_OFFSET(15984, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 898),
+    NAME_FUNC_OFFSET(16025, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 899),
+    NAME_FUNC_OFFSET(16057, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 900),
+    NAME_FUNC_OFFSET(16076, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 901),
+    NAME_FUNC_OFFSET(16096, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 902),
+    NAME_FUNC_OFFSET(16121, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+    NAME_FUNC_OFFSET(16142, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+    NAME_FUNC_OFFSET(16166, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
+    NAME_FUNC_OFFSET(16196, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 906),
+    NAME_FUNC_OFFSET(16222, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 907),
+    NAME_FUNC_OFFSET(16247, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(16266, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 909),
+    NAME_FUNC_OFFSET(16290, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 910),
+    NAME_FUNC_OFFSET(16315, glUniform1uiEXT, glUniform1uiEXT, NULL, 911),
+    NAME_FUNC_OFFSET(16331, glUniform1uivEXT, glUniform1uivEXT, NULL, 912),
+    NAME_FUNC_OFFSET(16348, glUniform2uiEXT, glUniform2uiEXT, NULL, 913),
+    NAME_FUNC_OFFSET(16364, glUniform2uivEXT, glUniform2uivEXT, NULL, 914),
+    NAME_FUNC_OFFSET(16381, glUniform3uiEXT, glUniform3uiEXT, NULL, 915),
+    NAME_FUNC_OFFSET(16397, glUniform3uivEXT, glUniform3uivEXT, NULL, 916),
+    NAME_FUNC_OFFSET(16414, glUniform4uiEXT, glUniform4uiEXT, NULL, 917),
+    NAME_FUNC_OFFSET(16430, glUniform4uivEXT, glUniform4uivEXT, NULL, 918),
+    NAME_FUNC_OFFSET(16447, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 919),
+    NAME_FUNC_OFFSET(16468, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 920),
+    NAME_FUNC_OFFSET(16490, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 921),
+    NAME_FUNC_OFFSET(16512, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 922),
+    NAME_FUNC_OFFSET(16535, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 923),
+    NAME_FUNC_OFFSET(16556, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 924),
+    NAME_FUNC_OFFSET(16578, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 925),
+    NAME_FUNC_OFFSET(16600, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 926),
+    NAME_FUNC_OFFSET(16623, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 927),
+    NAME_FUNC_OFFSET(16644, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 928),
+    NAME_FUNC_OFFSET(16666, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 929),
+    NAME_FUNC_OFFSET(16688, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 930),
+    NAME_FUNC_OFFSET(16711, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 931),
+    NAME_FUNC_OFFSET(16733, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 932),
+    NAME_FUNC_OFFSET(16754, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 933),
+    NAME_FUNC_OFFSET(16776, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 934),
+    NAME_FUNC_OFFSET(16798, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 935),
+    NAME_FUNC_OFFSET(16821, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 936),
+    NAME_FUNC_OFFSET(16843, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 937),
+    NAME_FUNC_OFFSET(16866, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 938),
+    NAME_FUNC_OFFSET(16889, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 939),
+    NAME_FUNC_OFFSET(16915, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 940),
+    NAME_FUNC_OFFSET(16944, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 941),
+    NAME_FUNC_OFFSET(16966, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 942),
+    NAME_FUNC_OFFSET(16986, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 943),
+    NAME_FUNC_OFFSET(17005, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 944),
+    NAME_FUNC_OFFSET(17029, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 945),
+    NAME_FUNC_OFFSET(17053, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 946),
+    NAME_FUNC_OFFSET(17075, glClearColorIiEXT, glClearColorIiEXT, NULL, 947),
+    NAME_FUNC_OFFSET(17093, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 948),
+    NAME_FUNC_OFFSET(17112, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 949),
+    NAME_FUNC_OFFSET(17136, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 950),
+    NAME_FUNC_OFFSET(17161, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 951),
+    NAME_FUNC_OFFSET(17182, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 952),
+    NAME_FUNC_OFFSET(17204, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 953),
+    NAME_FUNC_OFFSET(17231, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 954),
+    NAME_FUNC_OFFSET(17256, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 955),
+    NAME_FUNC_OFFSET(17284, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 956),
+    NAME_FUNC_OFFSET(17304, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 957),
+    NAME_FUNC_OFFSET(17326, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 958),
+    NAME_FUNC_OFFSET(17347, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 959),
+    NAME_FUNC_OFFSET(17373, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 960),
+    NAME_FUNC_OFFSET(17406, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 961),
+    NAME_FUNC_OFFSET(17437, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 962),
+    NAME_FUNC_OFFSET(17458, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+    NAME_FUNC_OFFSET(17489, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+    NAME_FUNC_OFFSET(17509, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 965),
+    NAME_FUNC_OFFSET(17537, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 966),
+    NAME_FUNC_OFFSET(17560, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 967),
+    NAME_FUNC_OFFSET(17585, glActiveProgramEXT, glActiveProgramEXT, NULL, 968),
+    NAME_FUNC_OFFSET(17604, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 969),
+    NAME_FUNC_OFFSET(17629, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 970),
+    NAME_FUNC_OFFSET(17651, glTextureBarrierNV, glTextureBarrierNV, NULL, 971),
+    NAME_FUNC_OFFSET(17670, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(17695, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+    NAME_FUNC_OFFSET(17724, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
+    NAME_FUNC_OFFSET(17755, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
+    NAME_FUNC_OFFSET(17779, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
+    NAME_FUNC_OFFSET(17804, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 977),
+    NAME_FUNC_OFFSET(17843, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 978),
+    NAME_FUNC_OFFSET(17872, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(17890, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(17907, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(17923, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(17948, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(17968, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(17988, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(18011, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(18034, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(18054, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(18071, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(18088, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(18103, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(18127, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(18146, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(18165, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(18181, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(18200, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(18223, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18239, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18255, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(18282, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(18309, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(18329, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18348, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18367, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18397, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18427, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18457, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18487, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(18506, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(18529, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(18554, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(18579, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(18606, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(18634, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(18661, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(18689, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(18718, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(18747, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(18773, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(18804, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(18835, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(18859, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(18882, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(18900, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(18929, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(18958, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(18973, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(18999, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(19025, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(19040, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(19052, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(19072, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(19089, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(19105, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(19124, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(19147, glActiveTextureARB, glActiveTextureARB, NULL, 374),
+    NAME_FUNC_OFFSET(19163, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
+    NAME_FUNC_OFFSET(19185, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
+    NAME_FUNC_OFFSET(19203, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
+    NAME_FUNC_OFFSET(19222, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(19240, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(19259, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
+    NAME_FUNC_OFFSET(19277, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
+    NAME_FUNC_OFFSET(19296, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
+    NAME_FUNC_OFFSET(19314, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
+    NAME_FUNC_OFFSET(19333, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
+    NAME_FUNC_OFFSET(19351, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
+    NAME_FUNC_OFFSET(19370, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(19388, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(19407, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
+    NAME_FUNC_OFFSET(19425, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
+    NAME_FUNC_OFFSET(19444, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
+    NAME_FUNC_OFFSET(19462, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
+    NAME_FUNC_OFFSET(19481, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
+    NAME_FUNC_OFFSET(19499, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
+    NAME_FUNC_OFFSET(19518, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(19536, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(19555, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
+    NAME_FUNC_OFFSET(19573, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
+    NAME_FUNC_OFFSET(19592, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
+    NAME_FUNC_OFFSET(19610, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
+    NAME_FUNC_OFFSET(19629, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
+    NAME_FUNC_OFFSET(19647, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
+    NAME_FUNC_OFFSET(19666, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(19684, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(19703, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
+    NAME_FUNC_OFFSET(19721, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
+    NAME_FUNC_OFFSET(19740, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
+    NAME_FUNC_OFFSET(19758, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
+    NAME_FUNC_OFFSET(19777, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
+    NAME_FUNC_OFFSET(19800, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
+    NAME_FUNC_OFFSET(19823, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
+    NAME_FUNC_OFFSET(19846, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
+    NAME_FUNC_OFFSET(19869, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
+    NAME_FUNC_OFFSET(19892, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
+    NAME_FUNC_OFFSET(19909, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
+    NAME_FUNC_OFFSET(19932, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
+    NAME_FUNC_OFFSET(19955, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
+    NAME_FUNC_OFFSET(19978, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
+    NAME_FUNC_OFFSET(20004, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
+    NAME_FUNC_OFFSET(20030, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
+    NAME_FUNC_OFFSET(20056, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
+    NAME_FUNC_OFFSET(20080, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
+    NAME_FUNC_OFFSET(20107, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
+    NAME_FUNC_OFFSET(20133, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
+    NAME_FUNC_OFFSET(20153, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
+    NAME_FUNC_OFFSET(20173, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
+    NAME_FUNC_OFFSET(20193, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
+    NAME_FUNC_OFFSET(20216, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
+    NAME_FUNC_OFFSET(20240, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
+    NAME_FUNC_OFFSET(20263, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
+    NAME_FUNC_OFFSET(20287, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
+    NAME_FUNC_OFFSET(20304, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
+    NAME_FUNC_OFFSET(20322, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
+    NAME_FUNC_OFFSET(20339, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
+    NAME_FUNC_OFFSET(20357, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
+    NAME_FUNC_OFFSET(20374, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
+    NAME_FUNC_OFFSET(20392, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
+    NAME_FUNC_OFFSET(20409, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
+    NAME_FUNC_OFFSET(20427, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
+    NAME_FUNC_OFFSET(20444, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
+    NAME_FUNC_OFFSET(20462, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
+    NAME_FUNC_OFFSET(20479, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
+    NAME_FUNC_OFFSET(20497, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
+    NAME_FUNC_OFFSET(20514, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
+    NAME_FUNC_OFFSET(20532, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
+    NAME_FUNC_OFFSET(20549, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
+    NAME_FUNC_OFFSET(20567, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
+    NAME_FUNC_OFFSET(20584, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
+    NAME_FUNC_OFFSET(20602, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
+    NAME_FUNC_OFFSET(20621, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
+    NAME_FUNC_OFFSET(20640, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
+    NAME_FUNC_OFFSET(20659, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
+    NAME_FUNC_OFFSET(20678, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
+    NAME_FUNC_OFFSET(20698, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
+    NAME_FUNC_OFFSET(20718, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
+    NAME_FUNC_OFFSET(20738, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
+    NAME_FUNC_OFFSET(20756, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
+    NAME_FUNC_OFFSET(20773, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
+    NAME_FUNC_OFFSET(20791, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
+    NAME_FUNC_OFFSET(20808, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
+    NAME_FUNC_OFFSET(20826, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
+    NAME_FUNC_OFFSET(20844, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
+    NAME_FUNC_OFFSET(20861, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
+    NAME_FUNC_OFFSET(20879, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
+    NAME_FUNC_OFFSET(20898, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
+    NAME_FUNC_OFFSET(20917, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
+    NAME_FUNC_OFFSET(20936, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
+    NAME_FUNC_OFFSET(20958, glBindBufferARB, glBindBufferARB, NULL, 510),
+    NAME_FUNC_OFFSET(20971, glBufferDataARB, glBufferDataARB, NULL, 511),
+    NAME_FUNC_OFFSET(20984, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
+    NAME_FUNC_OFFSET(21000, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
+    NAME_FUNC_OFFSET(21016, glGenBuffersARB, glGenBuffersARB, NULL, 514),
+    NAME_FUNC_OFFSET(21029, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
+    NAME_FUNC_OFFSET(21052, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
+    NAME_FUNC_OFFSET(21072, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
+    NAME_FUNC_OFFSET(21091, glIsBufferARB, glIsBufferARB, NULL, 518),
+    NAME_FUNC_OFFSET(21102, glMapBufferARB, glMapBufferARB, NULL, 519),
+    NAME_FUNC_OFFSET(21114, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
+    NAME_FUNC_OFFSET(21128, glBeginQueryARB, glBeginQueryARB, NULL, 521),
+    NAME_FUNC_OFFSET(21141, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
+    NAME_FUNC_OFFSET(21157, glEndQueryARB, glEndQueryARB, NULL, 523),
+    NAME_FUNC_OFFSET(21168, glGenQueriesARB, glGenQueriesARB, NULL, 524),
+    NAME_FUNC_OFFSET(21181, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
+    NAME_FUNC_OFFSET(21200, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
+    NAME_FUNC_OFFSET(21220, glGetQueryivARB, glGetQueryivARB, NULL, 527),
+    NAME_FUNC_OFFSET(21233, glIsQueryARB, glIsQueryARB, NULL, 528),
+    NAME_FUNC_OFFSET(21243, glCompileShaderARB, glCompileShaderARB, NULL, 530),
+    NAME_FUNC_OFFSET(21259, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
+    NAME_FUNC_OFFSET(21278, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
+    NAME_FUNC_OFFSET(21296, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
+    NAME_FUNC_OFFSET(21317, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
+    NAME_FUNC_OFFSET(21332, glGetUniformivARB, glGetUniformivARB, NULL, 544),
+    NAME_FUNC_OFFSET(21347, glLinkProgramARB, glLinkProgramARB, NULL, 545),
+    NAME_FUNC_OFFSET(21361, glShaderSourceARB, glShaderSourceARB, NULL, 546),
+    NAME_FUNC_OFFSET(21376, glUniform1fARB, glUniform1fARB, NULL, 547),
+    NAME_FUNC_OFFSET(21388, glUniform1fvARB, glUniform1fvARB, NULL, 548),
+    NAME_FUNC_OFFSET(21401, glUniform1iARB, glUniform1iARB, NULL, 549),
+    NAME_FUNC_OFFSET(21413, glUniform1ivARB, glUniform1ivARB, NULL, 550),
+    NAME_FUNC_OFFSET(21426, glUniform2fARB, glUniform2fARB, NULL, 551),
+    NAME_FUNC_OFFSET(21438, glUniform2fvARB, glUniform2fvARB, NULL, 552),
+    NAME_FUNC_OFFSET(21451, glUniform2iARB, glUniform2iARB, NULL, 553),
+    NAME_FUNC_OFFSET(21463, glUniform2ivARB, glUniform2ivARB, NULL, 554),
+    NAME_FUNC_OFFSET(21476, glUniform3fARB, glUniform3fARB, NULL, 555),
+    NAME_FUNC_OFFSET(21488, glUniform3fvARB, glUniform3fvARB, NULL, 556),
+    NAME_FUNC_OFFSET(21501, glUniform3iARB, glUniform3iARB, NULL, 557),
+    NAME_FUNC_OFFSET(21513, glUniform3ivARB, glUniform3ivARB, NULL, 558),
+    NAME_FUNC_OFFSET(21526, glUniform4fARB, glUniform4fARB, NULL, 559),
+    NAME_FUNC_OFFSET(21538, glUniform4fvARB, glUniform4fvARB, NULL, 560),
+    NAME_FUNC_OFFSET(21551, glUniform4iARB, glUniform4iARB, NULL, 561),
+    NAME_FUNC_OFFSET(21563, glUniform4ivARB, glUniform4ivARB, NULL, 562),
+    NAME_FUNC_OFFSET(21576, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
+    NAME_FUNC_OFFSET(21595, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
+    NAME_FUNC_OFFSET(21614, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
+    NAME_FUNC_OFFSET(21633, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
+    NAME_FUNC_OFFSET(21646, glValidateProgramARB, glValidateProgramARB, NULL, 567),
+    NAME_FUNC_OFFSET(21664, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
+    NAME_FUNC_OFFSET(21685, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
+    NAME_FUNC_OFFSET(21703, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
+    NAME_FUNC_OFFSET(21723, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(21737, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(21754, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(21770, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(21795, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(21817, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
+    NAME_FUNC_OFFSET(21844, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
+    NAME_FUNC_OFFSET(21868, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
+    NAME_FUNC_OFFSET(21904, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 597),
+    NAME_FUNC_OFFSET(21938, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
+    NAME_FUNC_OFFSET(21964, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
+    NAME_FUNC_OFFSET(21994, glBlendFunciARB, glBlendFunciARB, NULL, 600),
+    NAME_FUNC_OFFSET(22016, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
+    NAME_FUNC_OFFSET(22032, gl_dispatch_stub_705, gl_dispatch_stub_705, NULL, 705),
+    NAME_FUNC_OFFSET(22051, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
+    NAME_FUNC_OFFSET(22069, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
+    NAME_FUNC_OFFSET(22090, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
+    NAME_FUNC_OFFSET(22112, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
+    NAME_FUNC_OFFSET(22131, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
+    NAME_FUNC_OFFSET(22153, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
+    NAME_FUNC_OFFSET(22176, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 716),
+    NAME_FUNC_OFFSET(22195, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 717),
+    NAME_FUNC_OFFSET(22215, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 718),
+    NAME_FUNC_OFFSET(22234, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 719),
+    NAME_FUNC_OFFSET(22254, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 720),
+    NAME_FUNC_OFFSET(22273, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 721),
+    NAME_FUNC_OFFSET(22293, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 722),
+    NAME_FUNC_OFFSET(22312, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 723),
+    NAME_FUNC_OFFSET(22332, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 724),
+    NAME_FUNC_OFFSET(22351, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 725),
+    NAME_FUNC_OFFSET(22371, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 726),
+    NAME_FUNC_OFFSET(22391, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 727),
+    NAME_FUNC_OFFSET(22412, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 728),
+    NAME_FUNC_OFFSET(22432, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 729),
+    NAME_FUNC_OFFSET(22453, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 730),
+    NAME_FUNC_OFFSET(22473, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 731),
+    NAME_FUNC_OFFSET(22494, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 732),
+    NAME_FUNC_OFFSET(22518, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 733),
+    NAME_FUNC_OFFSET(22536, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 734),
+    NAME_FUNC_OFFSET(22556, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 735),
+    NAME_FUNC_OFFSET(22574, glFogCoorddEXT, glFogCoorddEXT, NULL, 736),
+    NAME_FUNC_OFFSET(22586, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 737),
+    NAME_FUNC_OFFSET(22599, glFogCoordfEXT, glFogCoordfEXT, NULL, 738),
+    NAME_FUNC_OFFSET(22611, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 739),
+    NAME_FUNC_OFFSET(22624, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 741),
+    NAME_FUNC_OFFSET(22644, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 741),
+    NAME_FUNC_OFFSET(22668, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22682, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22699, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22714, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22732, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22746, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22763, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22778, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22796, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22810, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22827, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22842, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22860, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22874, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22891, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22906, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22924, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22938, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22955, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
+    NAME_FUNC_OFFSET(22970, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
+    NAME_FUNC_OFFSET(22988, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
+    NAME_FUNC_OFFSET(23002, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
+    NAME_FUNC_OFFSET(23019, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
+    NAME_FUNC_OFFSET(23034, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
+    NAME_FUNC_OFFSET(23052, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23066, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23083, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23098, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23116, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
+    NAME_FUNC_OFFSET(23130, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
+    NAME_FUNC_OFFSET(23147, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
+    NAME_FUNC_OFFSET(23162, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
+    NAME_FUNC_OFFSET(23180, glBindProgramNV, glBindProgramNV, NULL, 792),
+    NAME_FUNC_OFFSET(23197, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 793),
+    NAME_FUNC_OFFSET(23217, glGenProgramsNV, glGenProgramsNV, NULL, 795),
+    NAME_FUNC_OFFSET(23234, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 801),
+    NAME_FUNC_OFFSET(23260, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 801),
+    NAME_FUNC_OFFSET(23289, glIsProgramNV, glIsProgramNV, NULL, 805),
+    NAME_FUNC_OFFSET(23304, glPointParameteriNV, glPointParameteriNV, NULL, 869),
+    NAME_FUNC_OFFSET(23322, glPointParameterivNV, glPointParameterivNV, NULL, 870),
+    NAME_FUNC_OFFSET(23341, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+    NAME_FUNC_OFFSET(23362, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
+    NAME_FUNC_OFFSET(23378, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 882),
+    NAME_FUNC_OFFSET(23402, gl_dispatch_stub_885, gl_dispatch_stub_885, NULL, 885),
+    NAME_FUNC_OFFSET(23426, gl_dispatch_stub_885, gl_dispatch_stub_885, NULL, 885),
+    NAME_FUNC_OFFSET(23453, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 886),
+    NAME_FUNC_OFFSET(23471, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 887),
+    NAME_FUNC_OFFSET(23490, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 888),
+    NAME_FUNC_OFFSET(23515, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 889),
+    NAME_FUNC_OFFSET(23536, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 890),
+    NAME_FUNC_OFFSET(23558, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 891),
+    NAME_FUNC_OFFSET(23584, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 892),
+    NAME_FUNC_OFFSET(23607, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 893),
+    NAME_FUNC_OFFSET(23630, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 894),
+    NAME_FUNC_OFFSET(23653, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 895),
+    NAME_FUNC_OFFSET(23671, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 896),
+    NAME_FUNC_OFFSET(23690, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 897),
+    NAME_FUNC_OFFSET(23707, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 898),
+    NAME_FUNC_OFFSET(23745, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 899),
+    NAME_FUNC_OFFSET(23774, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 900),
+    NAME_FUNC_OFFSET(23790, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 901),
+    NAME_FUNC_OFFSET(23807, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 902),
+    NAME_FUNC_OFFSET(23829, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+    NAME_FUNC_OFFSET(23847, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 906),
+    NAME_FUNC_OFFSET(23870, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 907),
+    NAME_FUNC_OFFSET(23892, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(23908, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 909),
+    NAME_FUNC_OFFSET(23929, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 910),
+    NAME_FUNC_OFFSET(23951, glUniform1uiEXT, glUniform1uiEXT, NULL, 911),
+    NAME_FUNC_OFFSET(23964, glUniform1uivEXT, glUniform1uivEXT, NULL, 912),
+    NAME_FUNC_OFFSET(23978, glUniform2uiEXT, glUniform2uiEXT, NULL, 913),
+    NAME_FUNC_OFFSET(23991, glUniform2uivEXT, glUniform2uivEXT, NULL, 914),
+    NAME_FUNC_OFFSET(24005, glUniform3uiEXT, glUniform3uiEXT, NULL, 915),
+    NAME_FUNC_OFFSET(24018, glUniform3uivEXT, glUniform3uivEXT, NULL, 916),
+    NAME_FUNC_OFFSET(24032, glUniform4uiEXT, glUniform4uiEXT, NULL, 917),
+    NAME_FUNC_OFFSET(24045, glUniform4uivEXT, glUniform4uivEXT, NULL, 918),
+    NAME_FUNC_OFFSET(24059, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 919),
+    NAME_FUNC_OFFSET(24077, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 920),
+    NAME_FUNC_OFFSET(24096, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 921),
+    NAME_FUNC_OFFSET(24115, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 922),
+    NAME_FUNC_OFFSET(24135, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 923),
+    NAME_FUNC_OFFSET(24153, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 924),
+    NAME_FUNC_OFFSET(24172, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 925),
+    NAME_FUNC_OFFSET(24191, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 926),
+    NAME_FUNC_OFFSET(24211, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 927),
+    NAME_FUNC_OFFSET(24229, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 928),
+    NAME_FUNC_OFFSET(24248, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 929),
+    NAME_FUNC_OFFSET(24267, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 930),
+    NAME_FUNC_OFFSET(24287, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 931),
+    NAME_FUNC_OFFSET(24306, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 932),
+    NAME_FUNC_OFFSET(24324, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 933),
+    NAME_FUNC_OFFSET(24343, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 934),
+    NAME_FUNC_OFFSET(24362, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 935),
+    NAME_FUNC_OFFSET(24382, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 936),
+    NAME_FUNC_OFFSET(24401, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 937),
+    NAME_FUNC_OFFSET(24421, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 938),
+    NAME_FUNC_OFFSET(24441, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 939),
+    NAME_FUNC_OFFSET(24464, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 940),
+    NAME_FUNC_OFFSET(24490, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 940),
+    NAME_FUNC_OFFSET(24519, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 941),
+    NAME_FUNC_OFFSET(24532, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 942),
+    NAME_FUNC_OFFSET(24543, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 943),
+    NAME_FUNC_OFFSET(24553, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 944),
+    NAME_FUNC_OFFSET(24569, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 945),
+    NAME_FUNC_OFFSET(24585, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 946),
+    NAME_FUNC_OFFSET(24598, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 949),
+    NAME_FUNC_OFFSET(24619, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 950),
+    NAME_FUNC_OFFSET(24641, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 951),
+    NAME_FUNC_OFFSET(24659, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 952),
+    NAME_FUNC_OFFSET(24678, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 953),
+    NAME_FUNC_OFFSET(24703, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 954),
+    NAME_FUNC_OFFSET(24726, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 955),
+    NAME_FUNC_OFFSET(24751, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 956),
+    NAME_FUNC_OFFSET(24768, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 958),
+    NAME_FUNC_OFFSET(24786, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 959),
+    NAME_FUNC_OFFSET(24809, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 960),
+    NAME_FUNC_OFFSET(24839, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 961),
+    NAME_FUNC_OFFSET(24867, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 962),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
index eeae59929..f23857ad2 100644
--- a/mesalib/src/mesa/main/APIspec.xml
+++ b/mesalib/src/mesa/main/APIspec.xml
@@ -1174,15 +1174,30 @@
 
 	<desc name="pname">
 		<value name="GL_PACK_ALIGNMENT"/>
+		<desc name="param" error="GL_INVALID_VALUE">
+			<value name="1"/>
+			<value name="2"/>
+			<value name="4"/>
+			<value name="8"/>
+		</desc>
+	</desc>
+
+	<desc name="pname">
 		<value name="GL_UNPACK_ALIGNMENT"/>
+		<desc name="param" error="GL_INVALID_VALUE">
+			<value name="1"/>
+			<value name="2"/>
+			<value name="4"/>
+			<value name="8"/>
+		</desc>
 	</desc>
 
-	<desc name="param" error="GL_INVALID_VALUE">
-		<value name="1"/>
-		<value name="2"/>
-		<value name="4"/>
-		<value name="8"/>
+	<desc name="pname" category="EXT_unpack_subimage">
+		<value name="GL_UNPACK_ROW_LENGTH"/>
+		<value name="GL_UNPACK_SKIP_PIXELS"/>
+		<value name="GL_UNPACK_SKIP_ROWS"/>
 	</desc>
+
 </template>
 
 <template name="ReadPixels" direction="get">
@@ -3829,6 +3844,8 @@
 	<category name="OES_element_index_uint"/>
 	<category name="OES_mapbuffer"/>
 	<category name="EXT_texture_filter_anisotropic"/>
+	<category name="EXT_texture_format_BGRA8888"/>
+	<category name="EXT_read_format_bgra"/>
 
 	<category name="ARB_texture_non_power_of_two"/>
 	<!-- disabled due to missing enums
@@ -4123,12 +4140,14 @@
 	<category name="OES_packed_depth_stencil"/>
 	<category name="OES_standard_derivatives"/>
 	<category name="EXT_texture_format_BGRA8888"/>
+	<category name="EXT_read_format_bgra"/>
 
 	<category name="EXT_texture_compression_dxt1"/>
 	<category name="EXT_blend_minmax"/>
 	<category name="EXT_multi_draw_arrays"/>
 	<category name="OES_EGL_image"/>
 	<category name="OES_EGL_image_external"/>
+        <category name="EXT_unpack_subimage"/>
 
 	<category name="NV_draw_buffers"/>
 	<function name="DrawBuffersNV" template="DrawBuffers"/>
diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index 6ae69f770..e5b05b7b5 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 977
+#define _gloffset_COUNT 979
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -669,386 +669,388 @@
 #define _gloffset_BlendEquationiARB 598
 #define _gloffset_BlendFuncSeparateiARB 599
 #define _gloffset_BlendFunciARB 600
-#define _gloffset_BindSampler 601
-#define _gloffset_DeleteSamplers 602
-#define _gloffset_GenSamplers 603
-#define _gloffset_GetSamplerParameterIiv 604
-#define _gloffset_GetSamplerParameterIuiv 605
-#define _gloffset_GetSamplerParameterfv 606
-#define _gloffset_GetSamplerParameteriv 607
-#define _gloffset_IsSampler 608
-#define _gloffset_SamplerParameterIiv 609
-#define _gloffset_SamplerParameterIuiv 610
-#define _gloffset_SamplerParameterf 611
-#define _gloffset_SamplerParameterfv 612
-#define _gloffset_SamplerParameteri 613
-#define _gloffset_SamplerParameteriv 614
-#define _gloffset_ColorP3ui 615
-#define _gloffset_ColorP3uiv 616
-#define _gloffset_ColorP4ui 617
-#define _gloffset_ColorP4uiv 618
-#define _gloffset_MultiTexCoordP1ui 619
-#define _gloffset_MultiTexCoordP1uiv 620
-#define _gloffset_MultiTexCoordP2ui 621
-#define _gloffset_MultiTexCoordP2uiv 622
-#define _gloffset_MultiTexCoordP3ui 623
-#define _gloffset_MultiTexCoordP3uiv 624
-#define _gloffset_MultiTexCoordP4ui 625
-#define _gloffset_MultiTexCoordP4uiv 626
-#define _gloffset_NormalP3ui 627
-#define _gloffset_NormalP3uiv 628
-#define _gloffset_SecondaryColorP3ui 629
-#define _gloffset_SecondaryColorP3uiv 630
-#define _gloffset_TexCoordP1ui 631
-#define _gloffset_TexCoordP1uiv 632
-#define _gloffset_TexCoordP2ui 633
-#define _gloffset_TexCoordP2uiv 634
-#define _gloffset_TexCoordP3ui 635
-#define _gloffset_TexCoordP3uiv 636
-#define _gloffset_TexCoordP4ui 637
-#define _gloffset_TexCoordP4uiv 638
-#define _gloffset_VertexAttribP1ui 639
-#define _gloffset_VertexAttribP1uiv 640
-#define _gloffset_VertexAttribP2ui 641
-#define _gloffset_VertexAttribP2uiv 642
-#define _gloffset_VertexAttribP3ui 643
-#define _gloffset_VertexAttribP3uiv 644
-#define _gloffset_VertexAttribP4ui 645
-#define _gloffset_VertexAttribP4uiv 646
-#define _gloffset_VertexP2ui 647
-#define _gloffset_VertexP2uiv 648
-#define _gloffset_VertexP3ui 649
-#define _gloffset_VertexP3uiv 650
-#define _gloffset_VertexP4ui 651
-#define _gloffset_VertexP4uiv 652
-#define _gloffset_BindTransformFeedback 653
-#define _gloffset_DeleteTransformFeedbacks 654
-#define _gloffset_DrawTransformFeedback 655
-#define _gloffset_GenTransformFeedbacks 656
-#define _gloffset_IsTransformFeedback 657
-#define _gloffset_PauseTransformFeedback 658
-#define _gloffset_ResumeTransformFeedback 659
-#define _gloffset_ClearDepthf 660
-#define _gloffset_DepthRangef 661
-#define _gloffset_GetShaderPrecisionFormat 662
-#define _gloffset_ReleaseShaderCompiler 663
-#define _gloffset_ShaderBinary 664
-#define _gloffset_DebugMessageCallbackARB 665
-#define _gloffset_DebugMessageControlARB 666
-#define _gloffset_DebugMessageInsertARB 667
-#define _gloffset_GetDebugMessageLogARB 668
-#define _gloffset_GetGraphicsResetStatusARB 669
-#define _gloffset_GetnColorTableARB 670
-#define _gloffset_GetnCompressedTexImageARB 671
-#define _gloffset_GetnConvolutionFilterARB 672
-#define _gloffset_GetnHistogramARB 673
-#define _gloffset_GetnMapdvARB 674
-#define _gloffset_GetnMapfvARB 675
-#define _gloffset_GetnMapivARB 676
-#define _gloffset_GetnMinmaxARB 677
-#define _gloffset_GetnPixelMapfvARB 678
-#define _gloffset_GetnPixelMapuivARB 679
-#define _gloffset_GetnPixelMapusvARB 680
-#define _gloffset_GetnPolygonStippleARB 681
-#define _gloffset_GetnSeparableFilterARB 682
-#define _gloffset_GetnTexImageARB 683
-#define _gloffset_GetnUniformdvARB 684
-#define _gloffset_GetnUniformfvARB 685
-#define _gloffset_GetnUniformivARB 686
-#define _gloffset_GetnUniformuivARB 687
-#define _gloffset_ReadnPixelsARB 688
-#define _gloffset_TexStorage1D 689
-#define _gloffset_TexStorage2D 690
-#define _gloffset_TexStorage3D 691
-#define _gloffset_TextureStorage1DEXT 692
-#define _gloffset_TextureStorage2DEXT 693
-#define _gloffset_TextureStorage3DEXT 694
-#define _gloffset_PolygonOffsetEXT 695
-#define _gloffset_GetPixelTexGenParameterfvSGIS 696
-#define _gloffset_GetPixelTexGenParameterivSGIS 697
-#define _gloffset_PixelTexGenParameterfSGIS 698
-#define _gloffset_PixelTexGenParameterfvSGIS 699
-#define _gloffset_PixelTexGenParameteriSGIS 700
-#define _gloffset_PixelTexGenParameterivSGIS 701
-#define _gloffset_SampleMaskSGIS 702
-#define _gloffset_SamplePatternSGIS 703
-#define _gloffset_ColorPointerEXT 704
-#define _gloffset_EdgeFlagPointerEXT 705
-#define _gloffset_IndexPointerEXT 706
-#define _gloffset_NormalPointerEXT 707
-#define _gloffset_TexCoordPointerEXT 708
-#define _gloffset_VertexPointerEXT 709
-#define _gloffset_PointParameterfEXT 710
-#define _gloffset_PointParameterfvEXT 711
-#define _gloffset_LockArraysEXT 712
-#define _gloffset_UnlockArraysEXT 713
-#define _gloffset_SecondaryColor3bEXT 714
-#define _gloffset_SecondaryColor3bvEXT 715
-#define _gloffset_SecondaryColor3dEXT 716
-#define _gloffset_SecondaryColor3dvEXT 717
-#define _gloffset_SecondaryColor3fEXT 718
-#define _gloffset_SecondaryColor3fvEXT 719
-#define _gloffset_SecondaryColor3iEXT 720
-#define _gloffset_SecondaryColor3ivEXT 721
-#define _gloffset_SecondaryColor3sEXT 722
-#define _gloffset_SecondaryColor3svEXT 723
-#define _gloffset_SecondaryColor3ubEXT 724
-#define _gloffset_SecondaryColor3ubvEXT 725
-#define _gloffset_SecondaryColor3uiEXT 726
-#define _gloffset_SecondaryColor3uivEXT 727
-#define _gloffset_SecondaryColor3usEXT 728
-#define _gloffset_SecondaryColor3usvEXT 729
-#define _gloffset_SecondaryColorPointerEXT 730
-#define _gloffset_MultiDrawArraysEXT 731
-#define _gloffset_MultiDrawElementsEXT 732
-#define _gloffset_FogCoordPointerEXT 733
-#define _gloffset_FogCoorddEXT 734
-#define _gloffset_FogCoorddvEXT 735
-#define _gloffset_FogCoordfEXT 736
-#define _gloffset_FogCoordfvEXT 737
-#define _gloffset_PixelTexGenSGIX 738
-#define _gloffset_BlendFuncSeparateEXT 739
-#define _gloffset_FlushVertexArrayRangeNV 740
-#define _gloffset_VertexArrayRangeNV 741
-#define _gloffset_CombinerInputNV 742
-#define _gloffset_CombinerOutputNV 743
-#define _gloffset_CombinerParameterfNV 744
-#define _gloffset_CombinerParameterfvNV 745
-#define _gloffset_CombinerParameteriNV 746
-#define _gloffset_CombinerParameterivNV 747
-#define _gloffset_FinalCombinerInputNV 748
-#define _gloffset_GetCombinerInputParameterfvNV 749
-#define _gloffset_GetCombinerInputParameterivNV 750
-#define _gloffset_GetCombinerOutputParameterfvNV 751
-#define _gloffset_GetCombinerOutputParameterivNV 752
-#define _gloffset_GetFinalCombinerInputParameterfvNV 753
-#define _gloffset_GetFinalCombinerInputParameterivNV 754
-#define _gloffset_ResizeBuffersMESA 755
-#define _gloffset_WindowPos2dMESA 756
-#define _gloffset_WindowPos2dvMESA 757
-#define _gloffset_WindowPos2fMESA 758
-#define _gloffset_WindowPos2fvMESA 759
-#define _gloffset_WindowPos2iMESA 760
-#define _gloffset_WindowPos2ivMESA 761
-#define _gloffset_WindowPos2sMESA 762
-#define _gloffset_WindowPos2svMESA 763
-#define _gloffset_WindowPos3dMESA 764
-#define _gloffset_WindowPos3dvMESA 765
-#define _gloffset_WindowPos3fMESA 766
-#define _gloffset_WindowPos3fvMESA 767
-#define _gloffset_WindowPos3iMESA 768
-#define _gloffset_WindowPos3ivMESA 769
-#define _gloffset_WindowPos3sMESA 770
-#define _gloffset_WindowPos3svMESA 771
-#define _gloffset_WindowPos4dMESA 772
-#define _gloffset_WindowPos4dvMESA 773
-#define _gloffset_WindowPos4fMESA 774
-#define _gloffset_WindowPos4fvMESA 775
-#define _gloffset_WindowPos4iMESA 776
-#define _gloffset_WindowPos4ivMESA 777
-#define _gloffset_WindowPos4sMESA 778
-#define _gloffset_WindowPos4svMESA 779
-#define _gloffset_MultiModeDrawArraysIBM 780
-#define _gloffset_MultiModeDrawElementsIBM 781
-#define _gloffset_DeleteFencesNV 782
-#define _gloffset_FinishFenceNV 783
-#define _gloffset_GenFencesNV 784
-#define _gloffset_GetFenceivNV 785
-#define _gloffset_IsFenceNV 786
-#define _gloffset_SetFenceNV 787
-#define _gloffset_TestFenceNV 788
-#define _gloffset_AreProgramsResidentNV 789
-#define _gloffset_BindProgramNV 790
-#define _gloffset_DeleteProgramsNV 791
-#define _gloffset_ExecuteProgramNV 792
-#define _gloffset_GenProgramsNV 793
-#define _gloffset_GetProgramParameterdvNV 794
-#define _gloffset_GetProgramParameterfvNV 795
-#define _gloffset_GetProgramStringNV 796
-#define _gloffset_GetProgramivNV 797
-#define _gloffset_GetTrackMatrixivNV 798
-#define _gloffset_GetVertexAttribPointervNV 799
-#define _gloffset_GetVertexAttribdvNV 800
-#define _gloffset_GetVertexAttribfvNV 801
-#define _gloffset_GetVertexAttribivNV 802
-#define _gloffset_IsProgramNV 803
-#define _gloffset_LoadProgramNV 804
-#define _gloffset_ProgramParameters4dvNV 805
-#define _gloffset_ProgramParameters4fvNV 806
-#define _gloffset_RequestResidentProgramsNV 807
-#define _gloffset_TrackMatrixNV 808
-#define _gloffset_VertexAttrib1dNV 809
-#define _gloffset_VertexAttrib1dvNV 810
-#define _gloffset_VertexAttrib1fNV 811
-#define _gloffset_VertexAttrib1fvNV 812
-#define _gloffset_VertexAttrib1sNV 813
-#define _gloffset_VertexAttrib1svNV 814
-#define _gloffset_VertexAttrib2dNV 815
-#define _gloffset_VertexAttrib2dvNV 816
-#define _gloffset_VertexAttrib2fNV 817
-#define _gloffset_VertexAttrib2fvNV 818
-#define _gloffset_VertexAttrib2sNV 819
-#define _gloffset_VertexAttrib2svNV 820
-#define _gloffset_VertexAttrib3dNV 821
-#define _gloffset_VertexAttrib3dvNV 822
-#define _gloffset_VertexAttrib3fNV 823
-#define _gloffset_VertexAttrib3fvNV 824
-#define _gloffset_VertexAttrib3sNV 825
-#define _gloffset_VertexAttrib3svNV 826
-#define _gloffset_VertexAttrib4dNV 827
-#define _gloffset_VertexAttrib4dvNV 828
-#define _gloffset_VertexAttrib4fNV 829
-#define _gloffset_VertexAttrib4fvNV 830
-#define _gloffset_VertexAttrib4sNV 831
-#define _gloffset_VertexAttrib4svNV 832
-#define _gloffset_VertexAttrib4ubNV 833
-#define _gloffset_VertexAttrib4ubvNV 834
-#define _gloffset_VertexAttribPointerNV 835
-#define _gloffset_VertexAttribs1dvNV 836
-#define _gloffset_VertexAttribs1fvNV 837
-#define _gloffset_VertexAttribs1svNV 838
-#define _gloffset_VertexAttribs2dvNV 839
-#define _gloffset_VertexAttribs2fvNV 840
-#define _gloffset_VertexAttribs2svNV 841
-#define _gloffset_VertexAttribs3dvNV 842
-#define _gloffset_VertexAttribs3fvNV 843
-#define _gloffset_VertexAttribs3svNV 844
-#define _gloffset_VertexAttribs4dvNV 845
-#define _gloffset_VertexAttribs4fvNV 846
-#define _gloffset_VertexAttribs4svNV 847
-#define _gloffset_VertexAttribs4ubvNV 848
-#define _gloffset_GetTexBumpParameterfvATI 849
-#define _gloffset_GetTexBumpParameterivATI 850
-#define _gloffset_TexBumpParameterfvATI 851
-#define _gloffset_TexBumpParameterivATI 852
-#define _gloffset_AlphaFragmentOp1ATI 853
-#define _gloffset_AlphaFragmentOp2ATI 854
-#define _gloffset_AlphaFragmentOp3ATI 855
-#define _gloffset_BeginFragmentShaderATI 856
-#define _gloffset_BindFragmentShaderATI 857
-#define _gloffset_ColorFragmentOp1ATI 858
-#define _gloffset_ColorFragmentOp2ATI 859
-#define _gloffset_ColorFragmentOp3ATI 860
-#define _gloffset_DeleteFragmentShaderATI 861
-#define _gloffset_EndFragmentShaderATI 862
-#define _gloffset_GenFragmentShadersATI 863
-#define _gloffset_PassTexCoordATI 864
-#define _gloffset_SampleMapATI 865
-#define _gloffset_SetFragmentShaderConstantATI 866
-#define _gloffset_PointParameteriNV 867
-#define _gloffset_PointParameterivNV 868
-#define _gloffset_ActiveStencilFaceEXT 869
-#define _gloffset_BindVertexArrayAPPLE 870
-#define _gloffset_DeleteVertexArraysAPPLE 871
-#define _gloffset_GenVertexArraysAPPLE 872
-#define _gloffset_IsVertexArrayAPPLE 873
-#define _gloffset_GetProgramNamedParameterdvNV 874
-#define _gloffset_GetProgramNamedParameterfvNV 875
-#define _gloffset_ProgramNamedParameter4dNV 876
-#define _gloffset_ProgramNamedParameter4dvNV 877
-#define _gloffset_ProgramNamedParameter4fNV 878
-#define _gloffset_ProgramNamedParameter4fvNV 879
-#define _gloffset_PrimitiveRestartIndexNV 880
-#define _gloffset_PrimitiveRestartNV 881
-#define _gloffset_DepthBoundsEXT 882
-#define _gloffset_BlendEquationSeparateEXT 883
-#define _gloffset_BindFramebufferEXT 884
-#define _gloffset_BindRenderbufferEXT 885
-#define _gloffset_CheckFramebufferStatusEXT 886
-#define _gloffset_DeleteFramebuffersEXT 887
-#define _gloffset_DeleteRenderbuffersEXT 888
-#define _gloffset_FramebufferRenderbufferEXT 889
-#define _gloffset_FramebufferTexture1DEXT 890
-#define _gloffset_FramebufferTexture2DEXT 891
-#define _gloffset_FramebufferTexture3DEXT 892
-#define _gloffset_GenFramebuffersEXT 893
-#define _gloffset_GenRenderbuffersEXT 894
-#define _gloffset_GenerateMipmapEXT 895
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 896
-#define _gloffset_GetRenderbufferParameterivEXT 897
-#define _gloffset_IsFramebufferEXT 898
-#define _gloffset_IsRenderbufferEXT 899
-#define _gloffset_RenderbufferStorageEXT 900
-#define _gloffset_BlitFramebufferEXT 901
-#define _gloffset_BufferParameteriAPPLE 902
-#define _gloffset_FlushMappedBufferRangeAPPLE 903
-#define _gloffset_BindFragDataLocationEXT 904
-#define _gloffset_GetFragDataLocationEXT 905
-#define _gloffset_GetUniformuivEXT 906
-#define _gloffset_GetVertexAttribIivEXT 907
-#define _gloffset_GetVertexAttribIuivEXT 908
-#define _gloffset_Uniform1uiEXT 909
-#define _gloffset_Uniform1uivEXT 910
-#define _gloffset_Uniform2uiEXT 911
-#define _gloffset_Uniform2uivEXT 912
-#define _gloffset_Uniform3uiEXT 913
-#define _gloffset_Uniform3uivEXT 914
-#define _gloffset_Uniform4uiEXT 915
-#define _gloffset_Uniform4uivEXT 916
-#define _gloffset_VertexAttribI1iEXT 917
-#define _gloffset_VertexAttribI1ivEXT 918
-#define _gloffset_VertexAttribI1uiEXT 919
-#define _gloffset_VertexAttribI1uivEXT 920
-#define _gloffset_VertexAttribI2iEXT 921
-#define _gloffset_VertexAttribI2ivEXT 922
-#define _gloffset_VertexAttribI2uiEXT 923
-#define _gloffset_VertexAttribI2uivEXT 924
-#define _gloffset_VertexAttribI3iEXT 925
-#define _gloffset_VertexAttribI3ivEXT 926
-#define _gloffset_VertexAttribI3uiEXT 927
-#define _gloffset_VertexAttribI3uivEXT 928
-#define _gloffset_VertexAttribI4bvEXT 929
-#define _gloffset_VertexAttribI4iEXT 930
-#define _gloffset_VertexAttribI4ivEXT 931
-#define _gloffset_VertexAttribI4svEXT 932
-#define _gloffset_VertexAttribI4ubvEXT 933
-#define _gloffset_VertexAttribI4uiEXT 934
-#define _gloffset_VertexAttribI4uivEXT 935
-#define _gloffset_VertexAttribI4usvEXT 936
-#define _gloffset_VertexAttribIPointerEXT 937
-#define _gloffset_FramebufferTextureLayerEXT 938
-#define _gloffset_ColorMaskIndexedEXT 939
-#define _gloffset_DisableIndexedEXT 940
-#define _gloffset_EnableIndexedEXT 941
-#define _gloffset_GetBooleanIndexedvEXT 942
-#define _gloffset_GetIntegerIndexedvEXT 943
-#define _gloffset_IsEnabledIndexedEXT 944
-#define _gloffset_ClearColorIiEXT 945
-#define _gloffset_ClearColorIuiEXT 946
-#define _gloffset_GetTexParameterIivEXT 947
-#define _gloffset_GetTexParameterIuivEXT 948
-#define _gloffset_TexParameterIivEXT 949
-#define _gloffset_TexParameterIuivEXT 950
-#define _gloffset_BeginConditionalRenderNV 951
-#define _gloffset_EndConditionalRenderNV 952
-#define _gloffset_BeginTransformFeedbackEXT 953
-#define _gloffset_BindBufferBaseEXT 954
-#define _gloffset_BindBufferOffsetEXT 955
-#define _gloffset_BindBufferRangeEXT 956
-#define _gloffset_EndTransformFeedbackEXT 957
-#define _gloffset_GetTransformFeedbackVaryingEXT 958
-#define _gloffset_TransformFeedbackVaryingsEXT 959
-#define _gloffset_ProvokingVertexEXT 960
-#define _gloffset_GetTexParameterPointervAPPLE 961
-#define _gloffset_TextureRangeAPPLE 962
-#define _gloffset_GetObjectParameterivAPPLE 963
-#define _gloffset_ObjectPurgeableAPPLE 964
-#define _gloffset_ObjectUnpurgeableAPPLE 965
-#define _gloffset_ActiveProgramEXT 966
-#define _gloffset_CreateShaderProgramEXT 967
-#define _gloffset_UseShaderProgramEXT 968
-#define _gloffset_TextureBarrierNV 969
-#define _gloffset_StencilFuncSeparateATI 970
-#define _gloffset_ProgramEnvParameters4fvEXT 971
-#define _gloffset_ProgramLocalParameters4fvEXT 972
-#define _gloffset_GetQueryObjecti64vEXT 973
-#define _gloffset_GetQueryObjectui64vEXT 974
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 975
-#define _gloffset_EGLImageTargetTexture2DOES 976
+#define _gloffset_BindFragDataLocationIndexed 601
+#define _gloffset_GetFragDataIndex 602
+#define _gloffset_BindSampler 603
+#define _gloffset_DeleteSamplers 604
+#define _gloffset_GenSamplers 605
+#define _gloffset_GetSamplerParameterIiv 606
+#define _gloffset_GetSamplerParameterIuiv 607
+#define _gloffset_GetSamplerParameterfv 608
+#define _gloffset_GetSamplerParameteriv 609
+#define _gloffset_IsSampler 610
+#define _gloffset_SamplerParameterIiv 611
+#define _gloffset_SamplerParameterIuiv 612
+#define _gloffset_SamplerParameterf 613
+#define _gloffset_SamplerParameterfv 614
+#define _gloffset_SamplerParameteri 615
+#define _gloffset_SamplerParameteriv 616
+#define _gloffset_ColorP3ui 617
+#define _gloffset_ColorP3uiv 618
+#define _gloffset_ColorP4ui 619
+#define _gloffset_ColorP4uiv 620
+#define _gloffset_MultiTexCoordP1ui 621
+#define _gloffset_MultiTexCoordP1uiv 622
+#define _gloffset_MultiTexCoordP2ui 623
+#define _gloffset_MultiTexCoordP2uiv 624
+#define _gloffset_MultiTexCoordP3ui 625
+#define _gloffset_MultiTexCoordP3uiv 626
+#define _gloffset_MultiTexCoordP4ui 627
+#define _gloffset_MultiTexCoordP4uiv 628
+#define _gloffset_NormalP3ui 629
+#define _gloffset_NormalP3uiv 630
+#define _gloffset_SecondaryColorP3ui 631
+#define _gloffset_SecondaryColorP3uiv 632
+#define _gloffset_TexCoordP1ui 633
+#define _gloffset_TexCoordP1uiv 634
+#define _gloffset_TexCoordP2ui 635
+#define _gloffset_TexCoordP2uiv 636
+#define _gloffset_TexCoordP3ui 637
+#define _gloffset_TexCoordP3uiv 638
+#define _gloffset_TexCoordP4ui 639
+#define _gloffset_TexCoordP4uiv 640
+#define _gloffset_VertexAttribP1ui 641
+#define _gloffset_VertexAttribP1uiv 642
+#define _gloffset_VertexAttribP2ui 643
+#define _gloffset_VertexAttribP2uiv 644
+#define _gloffset_VertexAttribP3ui 645
+#define _gloffset_VertexAttribP3uiv 646
+#define _gloffset_VertexAttribP4ui 647
+#define _gloffset_VertexAttribP4uiv 648
+#define _gloffset_VertexP2ui 649
+#define _gloffset_VertexP2uiv 650
+#define _gloffset_VertexP3ui 651
+#define _gloffset_VertexP3uiv 652
+#define _gloffset_VertexP4ui 653
+#define _gloffset_VertexP4uiv 654
+#define _gloffset_BindTransformFeedback 655
+#define _gloffset_DeleteTransformFeedbacks 656
+#define _gloffset_DrawTransformFeedback 657
+#define _gloffset_GenTransformFeedbacks 658
+#define _gloffset_IsTransformFeedback 659
+#define _gloffset_PauseTransformFeedback 660
+#define _gloffset_ResumeTransformFeedback 661
+#define _gloffset_ClearDepthf 662
+#define _gloffset_DepthRangef 663
+#define _gloffset_GetShaderPrecisionFormat 664
+#define _gloffset_ReleaseShaderCompiler 665
+#define _gloffset_ShaderBinary 666
+#define _gloffset_DebugMessageCallbackARB 667
+#define _gloffset_DebugMessageControlARB 668
+#define _gloffset_DebugMessageInsertARB 669
+#define _gloffset_GetDebugMessageLogARB 670
+#define _gloffset_GetGraphicsResetStatusARB 671
+#define _gloffset_GetnColorTableARB 672
+#define _gloffset_GetnCompressedTexImageARB 673
+#define _gloffset_GetnConvolutionFilterARB 674
+#define _gloffset_GetnHistogramARB 675
+#define _gloffset_GetnMapdvARB 676
+#define _gloffset_GetnMapfvARB 677
+#define _gloffset_GetnMapivARB 678
+#define _gloffset_GetnMinmaxARB 679
+#define _gloffset_GetnPixelMapfvARB 680
+#define _gloffset_GetnPixelMapuivARB 681
+#define _gloffset_GetnPixelMapusvARB 682
+#define _gloffset_GetnPolygonStippleARB 683
+#define _gloffset_GetnSeparableFilterARB 684
+#define _gloffset_GetnTexImageARB 685
+#define _gloffset_GetnUniformdvARB 686
+#define _gloffset_GetnUniformfvARB 687
+#define _gloffset_GetnUniformivARB 688
+#define _gloffset_GetnUniformuivARB 689
+#define _gloffset_ReadnPixelsARB 690
+#define _gloffset_TexStorage1D 691
+#define _gloffset_TexStorage2D 692
+#define _gloffset_TexStorage3D 693
+#define _gloffset_TextureStorage1DEXT 694
+#define _gloffset_TextureStorage2DEXT 695
+#define _gloffset_TextureStorage3DEXT 696
+#define _gloffset_PolygonOffsetEXT 697
+#define _gloffset_GetPixelTexGenParameterfvSGIS 698
+#define _gloffset_GetPixelTexGenParameterivSGIS 699
+#define _gloffset_PixelTexGenParameterfSGIS 700
+#define _gloffset_PixelTexGenParameterfvSGIS 701
+#define _gloffset_PixelTexGenParameteriSGIS 702
+#define _gloffset_PixelTexGenParameterivSGIS 703
+#define _gloffset_SampleMaskSGIS 704
+#define _gloffset_SamplePatternSGIS 705
+#define _gloffset_ColorPointerEXT 706
+#define _gloffset_EdgeFlagPointerEXT 707
+#define _gloffset_IndexPointerEXT 708
+#define _gloffset_NormalPointerEXT 709
+#define _gloffset_TexCoordPointerEXT 710
+#define _gloffset_VertexPointerEXT 711
+#define _gloffset_PointParameterfEXT 712
+#define _gloffset_PointParameterfvEXT 713
+#define _gloffset_LockArraysEXT 714
+#define _gloffset_UnlockArraysEXT 715
+#define _gloffset_SecondaryColor3bEXT 716
+#define _gloffset_SecondaryColor3bvEXT 717
+#define _gloffset_SecondaryColor3dEXT 718
+#define _gloffset_SecondaryColor3dvEXT 719
+#define _gloffset_SecondaryColor3fEXT 720
+#define _gloffset_SecondaryColor3fvEXT 721
+#define _gloffset_SecondaryColor3iEXT 722
+#define _gloffset_SecondaryColor3ivEXT 723
+#define _gloffset_SecondaryColor3sEXT 724
+#define _gloffset_SecondaryColor3svEXT 725
+#define _gloffset_SecondaryColor3ubEXT 726
+#define _gloffset_SecondaryColor3ubvEXT 727
+#define _gloffset_SecondaryColor3uiEXT 728
+#define _gloffset_SecondaryColor3uivEXT 729
+#define _gloffset_SecondaryColor3usEXT 730
+#define _gloffset_SecondaryColor3usvEXT 731
+#define _gloffset_SecondaryColorPointerEXT 732
+#define _gloffset_MultiDrawArraysEXT 733
+#define _gloffset_MultiDrawElementsEXT 734
+#define _gloffset_FogCoordPointerEXT 735
+#define _gloffset_FogCoorddEXT 736
+#define _gloffset_FogCoorddvEXT 737
+#define _gloffset_FogCoordfEXT 738
+#define _gloffset_FogCoordfvEXT 739
+#define _gloffset_PixelTexGenSGIX 740
+#define _gloffset_BlendFuncSeparateEXT 741
+#define _gloffset_FlushVertexArrayRangeNV 742
+#define _gloffset_VertexArrayRangeNV 743
+#define _gloffset_CombinerInputNV 744
+#define _gloffset_CombinerOutputNV 745
+#define _gloffset_CombinerParameterfNV 746
+#define _gloffset_CombinerParameterfvNV 747
+#define _gloffset_CombinerParameteriNV 748
+#define _gloffset_CombinerParameterivNV 749
+#define _gloffset_FinalCombinerInputNV 750
+#define _gloffset_GetCombinerInputParameterfvNV 751
+#define _gloffset_GetCombinerInputParameterivNV 752
+#define _gloffset_GetCombinerOutputParameterfvNV 753
+#define _gloffset_GetCombinerOutputParameterivNV 754
+#define _gloffset_GetFinalCombinerInputParameterfvNV 755
+#define _gloffset_GetFinalCombinerInputParameterivNV 756
+#define _gloffset_ResizeBuffersMESA 757
+#define _gloffset_WindowPos2dMESA 758
+#define _gloffset_WindowPos2dvMESA 759
+#define _gloffset_WindowPos2fMESA 760
+#define _gloffset_WindowPos2fvMESA 761
+#define _gloffset_WindowPos2iMESA 762
+#define _gloffset_WindowPos2ivMESA 763
+#define _gloffset_WindowPos2sMESA 764
+#define _gloffset_WindowPos2svMESA 765
+#define _gloffset_WindowPos3dMESA 766
+#define _gloffset_WindowPos3dvMESA 767
+#define _gloffset_WindowPos3fMESA 768
+#define _gloffset_WindowPos3fvMESA 769
+#define _gloffset_WindowPos3iMESA 770
+#define _gloffset_WindowPos3ivMESA 771
+#define _gloffset_WindowPos3sMESA 772
+#define _gloffset_WindowPos3svMESA 773
+#define _gloffset_WindowPos4dMESA 774
+#define _gloffset_WindowPos4dvMESA 775
+#define _gloffset_WindowPos4fMESA 776
+#define _gloffset_WindowPos4fvMESA 777
+#define _gloffset_WindowPos4iMESA 778
+#define _gloffset_WindowPos4ivMESA 779
+#define _gloffset_WindowPos4sMESA 780
+#define _gloffset_WindowPos4svMESA 781
+#define _gloffset_MultiModeDrawArraysIBM 782
+#define _gloffset_MultiModeDrawElementsIBM 783
+#define _gloffset_DeleteFencesNV 784
+#define _gloffset_FinishFenceNV 785
+#define _gloffset_GenFencesNV 786
+#define _gloffset_GetFenceivNV 787
+#define _gloffset_IsFenceNV 788
+#define _gloffset_SetFenceNV 789
+#define _gloffset_TestFenceNV 790
+#define _gloffset_AreProgramsResidentNV 791
+#define _gloffset_BindProgramNV 792
+#define _gloffset_DeleteProgramsNV 793
+#define _gloffset_ExecuteProgramNV 794
+#define _gloffset_GenProgramsNV 795
+#define _gloffset_GetProgramParameterdvNV 796
+#define _gloffset_GetProgramParameterfvNV 797
+#define _gloffset_GetProgramStringNV 798
+#define _gloffset_GetProgramivNV 799
+#define _gloffset_GetTrackMatrixivNV 800
+#define _gloffset_GetVertexAttribPointervNV 801
+#define _gloffset_GetVertexAttribdvNV 802
+#define _gloffset_GetVertexAttribfvNV 803
+#define _gloffset_GetVertexAttribivNV 804
+#define _gloffset_IsProgramNV 805
+#define _gloffset_LoadProgramNV 806
+#define _gloffset_ProgramParameters4dvNV 807
+#define _gloffset_ProgramParameters4fvNV 808
+#define _gloffset_RequestResidentProgramsNV 809
+#define _gloffset_TrackMatrixNV 810
+#define _gloffset_VertexAttrib1dNV 811
+#define _gloffset_VertexAttrib1dvNV 812
+#define _gloffset_VertexAttrib1fNV 813
+#define _gloffset_VertexAttrib1fvNV 814
+#define _gloffset_VertexAttrib1sNV 815
+#define _gloffset_VertexAttrib1svNV 816
+#define _gloffset_VertexAttrib2dNV 817
+#define _gloffset_VertexAttrib2dvNV 818
+#define _gloffset_VertexAttrib2fNV 819
+#define _gloffset_VertexAttrib2fvNV 820
+#define _gloffset_VertexAttrib2sNV 821
+#define _gloffset_VertexAttrib2svNV 822
+#define _gloffset_VertexAttrib3dNV 823
+#define _gloffset_VertexAttrib3dvNV 824
+#define _gloffset_VertexAttrib3fNV 825
+#define _gloffset_VertexAttrib3fvNV 826
+#define _gloffset_VertexAttrib3sNV 827
+#define _gloffset_VertexAttrib3svNV 828
+#define _gloffset_VertexAttrib4dNV 829
+#define _gloffset_VertexAttrib4dvNV 830
+#define _gloffset_VertexAttrib4fNV 831
+#define _gloffset_VertexAttrib4fvNV 832
+#define _gloffset_VertexAttrib4sNV 833
+#define _gloffset_VertexAttrib4svNV 834
+#define _gloffset_VertexAttrib4ubNV 835
+#define _gloffset_VertexAttrib4ubvNV 836
+#define _gloffset_VertexAttribPointerNV 837
+#define _gloffset_VertexAttribs1dvNV 838
+#define _gloffset_VertexAttribs1fvNV 839
+#define _gloffset_VertexAttribs1svNV 840
+#define _gloffset_VertexAttribs2dvNV 841
+#define _gloffset_VertexAttribs2fvNV 842
+#define _gloffset_VertexAttribs2svNV 843
+#define _gloffset_VertexAttribs3dvNV 844
+#define _gloffset_VertexAttribs3fvNV 845
+#define _gloffset_VertexAttribs3svNV 846
+#define _gloffset_VertexAttribs4dvNV 847
+#define _gloffset_VertexAttribs4fvNV 848
+#define _gloffset_VertexAttribs4svNV 849
+#define _gloffset_VertexAttribs4ubvNV 850
+#define _gloffset_GetTexBumpParameterfvATI 851
+#define _gloffset_GetTexBumpParameterivATI 852
+#define _gloffset_TexBumpParameterfvATI 853
+#define _gloffset_TexBumpParameterivATI 854
+#define _gloffset_AlphaFragmentOp1ATI 855
+#define _gloffset_AlphaFragmentOp2ATI 856
+#define _gloffset_AlphaFragmentOp3ATI 857
+#define _gloffset_BeginFragmentShaderATI 858
+#define _gloffset_BindFragmentShaderATI 859
+#define _gloffset_ColorFragmentOp1ATI 860
+#define _gloffset_ColorFragmentOp2ATI 861
+#define _gloffset_ColorFragmentOp3ATI 862
+#define _gloffset_DeleteFragmentShaderATI 863
+#define _gloffset_EndFragmentShaderATI 864
+#define _gloffset_GenFragmentShadersATI 865
+#define _gloffset_PassTexCoordATI 866
+#define _gloffset_SampleMapATI 867
+#define _gloffset_SetFragmentShaderConstantATI 868
+#define _gloffset_PointParameteriNV 869
+#define _gloffset_PointParameterivNV 870
+#define _gloffset_ActiveStencilFaceEXT 871
+#define _gloffset_BindVertexArrayAPPLE 872
+#define _gloffset_DeleteVertexArraysAPPLE 873
+#define _gloffset_GenVertexArraysAPPLE 874
+#define _gloffset_IsVertexArrayAPPLE 875
+#define _gloffset_GetProgramNamedParameterdvNV 876
+#define _gloffset_GetProgramNamedParameterfvNV 877
+#define _gloffset_ProgramNamedParameter4dNV 878
+#define _gloffset_ProgramNamedParameter4dvNV 879
+#define _gloffset_ProgramNamedParameter4fNV 880
+#define _gloffset_ProgramNamedParameter4fvNV 881
+#define _gloffset_PrimitiveRestartIndexNV 882
+#define _gloffset_PrimitiveRestartNV 883
+#define _gloffset_DepthBoundsEXT 884
+#define _gloffset_BlendEquationSeparateEXT 885
+#define _gloffset_BindFramebufferEXT 886
+#define _gloffset_BindRenderbufferEXT 887
+#define _gloffset_CheckFramebufferStatusEXT 888
+#define _gloffset_DeleteFramebuffersEXT 889
+#define _gloffset_DeleteRenderbuffersEXT 890
+#define _gloffset_FramebufferRenderbufferEXT 891
+#define _gloffset_FramebufferTexture1DEXT 892
+#define _gloffset_FramebufferTexture2DEXT 893
+#define _gloffset_FramebufferTexture3DEXT 894
+#define _gloffset_GenFramebuffersEXT 895
+#define _gloffset_GenRenderbuffersEXT 896
+#define _gloffset_GenerateMipmapEXT 897
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 898
+#define _gloffset_GetRenderbufferParameterivEXT 899
+#define _gloffset_IsFramebufferEXT 900
+#define _gloffset_IsRenderbufferEXT 901
+#define _gloffset_RenderbufferStorageEXT 902
+#define _gloffset_BlitFramebufferEXT 903
+#define _gloffset_BufferParameteriAPPLE 904
+#define _gloffset_FlushMappedBufferRangeAPPLE 905
+#define _gloffset_BindFragDataLocationEXT 906
+#define _gloffset_GetFragDataLocationEXT 907
+#define _gloffset_GetUniformuivEXT 908
+#define _gloffset_GetVertexAttribIivEXT 909
+#define _gloffset_GetVertexAttribIuivEXT 910
+#define _gloffset_Uniform1uiEXT 911
+#define _gloffset_Uniform1uivEXT 912
+#define _gloffset_Uniform2uiEXT 913
+#define _gloffset_Uniform2uivEXT 914
+#define _gloffset_Uniform3uiEXT 915
+#define _gloffset_Uniform3uivEXT 916
+#define _gloffset_Uniform4uiEXT 917
+#define _gloffset_Uniform4uivEXT 918
+#define _gloffset_VertexAttribI1iEXT 919
+#define _gloffset_VertexAttribI1ivEXT 920
+#define _gloffset_VertexAttribI1uiEXT 921
+#define _gloffset_VertexAttribI1uivEXT 922
+#define _gloffset_VertexAttribI2iEXT 923
+#define _gloffset_VertexAttribI2ivEXT 924
+#define _gloffset_VertexAttribI2uiEXT 925
+#define _gloffset_VertexAttribI2uivEXT 926
+#define _gloffset_VertexAttribI3iEXT 927
+#define _gloffset_VertexAttribI3ivEXT 928
+#define _gloffset_VertexAttribI3uiEXT 929
+#define _gloffset_VertexAttribI3uivEXT 930
+#define _gloffset_VertexAttribI4bvEXT 931
+#define _gloffset_VertexAttribI4iEXT 932
+#define _gloffset_VertexAttribI4ivEXT 933
+#define _gloffset_VertexAttribI4svEXT 934
+#define _gloffset_VertexAttribI4ubvEXT 935
+#define _gloffset_VertexAttribI4uiEXT 936
+#define _gloffset_VertexAttribI4uivEXT 937
+#define _gloffset_VertexAttribI4usvEXT 938
+#define _gloffset_VertexAttribIPointerEXT 939
+#define _gloffset_FramebufferTextureLayerEXT 940
+#define _gloffset_ColorMaskIndexedEXT 941
+#define _gloffset_DisableIndexedEXT 942
+#define _gloffset_EnableIndexedEXT 943
+#define _gloffset_GetBooleanIndexedvEXT 944
+#define _gloffset_GetIntegerIndexedvEXT 945
+#define _gloffset_IsEnabledIndexedEXT 946
+#define _gloffset_ClearColorIiEXT 947
+#define _gloffset_ClearColorIuiEXT 948
+#define _gloffset_GetTexParameterIivEXT 949
+#define _gloffset_GetTexParameterIuivEXT 950
+#define _gloffset_TexParameterIivEXT 951
+#define _gloffset_TexParameterIuivEXT 952
+#define _gloffset_BeginConditionalRenderNV 953
+#define _gloffset_EndConditionalRenderNV 954
+#define _gloffset_BeginTransformFeedbackEXT 955
+#define _gloffset_BindBufferBaseEXT 956
+#define _gloffset_BindBufferOffsetEXT 957
+#define _gloffset_BindBufferRangeEXT 958
+#define _gloffset_EndTransformFeedbackEXT 959
+#define _gloffset_GetTransformFeedbackVaryingEXT 960
+#define _gloffset_TransformFeedbackVaryingsEXT 961
+#define _gloffset_ProvokingVertexEXT 962
+#define _gloffset_GetTexParameterPointervAPPLE 963
+#define _gloffset_TextureRangeAPPLE 964
+#define _gloffset_GetObjectParameterivAPPLE 965
+#define _gloffset_ObjectPurgeableAPPLE 966
+#define _gloffset_ObjectUnpurgeableAPPLE 967
+#define _gloffset_ActiveProgramEXT 968
+#define _gloffset_CreateShaderProgramEXT 969
+#define _gloffset_UseShaderProgramEXT 970
+#define _gloffset_TextureBarrierNV 971
+#define _gloffset_StencilFuncSeparateATI 972
+#define _gloffset_ProgramEnvParameters4fvEXT 973
+#define _gloffset_ProgramLocalParameters4fvEXT 974
+#define _gloffset_GetQueryObjecti64vEXT 975
+#define _gloffset_GetQueryObjectui64vEXT 976
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 977
+#define _gloffset_EGLImageTargetTexture2DOES 978
 
 #else /* !FEATURE_remap_table */
 
-#define driDispatchRemapTable_size 569
+#define driDispatchRemapTable_size 571
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1244,382 +1246,384 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BlendEquationiARB_remap_index 190
 #define BlendFuncSeparateiARB_remap_index 191
 #define BlendFunciARB_remap_index 192
-#define BindSampler_remap_index 193
-#define DeleteSamplers_remap_index 194
-#define GenSamplers_remap_index 195
-#define GetSamplerParameterIiv_remap_index 196
-#define GetSamplerParameterIuiv_remap_index 197
-#define GetSamplerParameterfv_remap_index 198
-#define GetSamplerParameteriv_remap_index 199
-#define IsSampler_remap_index 200
-#define SamplerParameterIiv_remap_index 201
-#define SamplerParameterIuiv_remap_index 202
-#define SamplerParameterf_remap_index 203
-#define SamplerParameterfv_remap_index 204
-#define SamplerParameteri_remap_index 205
-#define SamplerParameteriv_remap_index 206
-#define ColorP3ui_remap_index 207
-#define ColorP3uiv_remap_index 208
-#define ColorP4ui_remap_index 209
-#define ColorP4uiv_remap_index 210
-#define MultiTexCoordP1ui_remap_index 211
-#define MultiTexCoordP1uiv_remap_index 212
-#define MultiTexCoordP2ui_remap_index 213
-#define MultiTexCoordP2uiv_remap_index 214
-#define MultiTexCoordP3ui_remap_index 215
-#define MultiTexCoordP3uiv_remap_index 216
-#define MultiTexCoordP4ui_remap_index 217
-#define MultiTexCoordP4uiv_remap_index 218
-#define NormalP3ui_remap_index 219
-#define NormalP3uiv_remap_index 220
-#define SecondaryColorP3ui_remap_index 221
-#define SecondaryColorP3uiv_remap_index 222
-#define TexCoordP1ui_remap_index 223
-#define TexCoordP1uiv_remap_index 224
-#define TexCoordP2ui_remap_index 225
-#define TexCoordP2uiv_remap_index 226
-#define TexCoordP3ui_remap_index 227
-#define TexCoordP3uiv_remap_index 228
-#define TexCoordP4ui_remap_index 229
-#define TexCoordP4uiv_remap_index 230
-#define VertexAttribP1ui_remap_index 231
-#define VertexAttribP1uiv_remap_index 232
-#define VertexAttribP2ui_remap_index 233
-#define VertexAttribP2uiv_remap_index 234
-#define VertexAttribP3ui_remap_index 235
-#define VertexAttribP3uiv_remap_index 236
-#define VertexAttribP4ui_remap_index 237
-#define VertexAttribP4uiv_remap_index 238
-#define VertexP2ui_remap_index 239
-#define VertexP2uiv_remap_index 240
-#define VertexP3ui_remap_index 241
-#define VertexP3uiv_remap_index 242
-#define VertexP4ui_remap_index 243
-#define VertexP4uiv_remap_index 244
-#define BindTransformFeedback_remap_index 245
-#define DeleteTransformFeedbacks_remap_index 246
-#define DrawTransformFeedback_remap_index 247
-#define GenTransformFeedbacks_remap_index 248
-#define IsTransformFeedback_remap_index 249
-#define PauseTransformFeedback_remap_index 250
-#define ResumeTransformFeedback_remap_index 251
-#define ClearDepthf_remap_index 252
-#define DepthRangef_remap_index 253
-#define GetShaderPrecisionFormat_remap_index 254
-#define ReleaseShaderCompiler_remap_index 255
-#define ShaderBinary_remap_index 256
-#define DebugMessageCallbackARB_remap_index 257
-#define DebugMessageControlARB_remap_index 258
-#define DebugMessageInsertARB_remap_index 259
-#define GetDebugMessageLogARB_remap_index 260
-#define GetGraphicsResetStatusARB_remap_index 261
-#define GetnColorTableARB_remap_index 262
-#define GetnCompressedTexImageARB_remap_index 263
-#define GetnConvolutionFilterARB_remap_index 264
-#define GetnHistogramARB_remap_index 265
-#define GetnMapdvARB_remap_index 266
-#define GetnMapfvARB_remap_index 267
-#define GetnMapivARB_remap_index 268
-#define GetnMinmaxARB_remap_index 269
-#define GetnPixelMapfvARB_remap_index 270
-#define GetnPixelMapuivARB_remap_index 271
-#define GetnPixelMapusvARB_remap_index 272
-#define GetnPolygonStippleARB_remap_index 273
-#define GetnSeparableFilterARB_remap_index 274
-#define GetnTexImageARB_remap_index 275
-#define GetnUniformdvARB_remap_index 276
-#define GetnUniformfvARB_remap_index 277
-#define GetnUniformivARB_remap_index 278
-#define GetnUniformuivARB_remap_index 279
-#define ReadnPixelsARB_remap_index 280
-#define TexStorage1D_remap_index 281
-#define TexStorage2D_remap_index 282
-#define TexStorage3D_remap_index 283
-#define TextureStorage1DEXT_remap_index 284
-#define TextureStorage2DEXT_remap_index 285
-#define TextureStorage3DEXT_remap_index 286
-#define PolygonOffsetEXT_remap_index 287
-#define GetPixelTexGenParameterfvSGIS_remap_index 288
-#define GetPixelTexGenParameterivSGIS_remap_index 289
-#define PixelTexGenParameterfSGIS_remap_index 290
-#define PixelTexGenParameterfvSGIS_remap_index 291
-#define PixelTexGenParameteriSGIS_remap_index 292
-#define PixelTexGenParameterivSGIS_remap_index 293
-#define SampleMaskSGIS_remap_index 294
-#define SamplePatternSGIS_remap_index 295
-#define ColorPointerEXT_remap_index 296
-#define EdgeFlagPointerEXT_remap_index 297
-#define IndexPointerEXT_remap_index 298
-#define NormalPointerEXT_remap_index 299
-#define TexCoordPointerEXT_remap_index 300
-#define VertexPointerEXT_remap_index 301
-#define PointParameterfEXT_remap_index 302
-#define PointParameterfvEXT_remap_index 303
-#define LockArraysEXT_remap_index 304
-#define UnlockArraysEXT_remap_index 305
-#define SecondaryColor3bEXT_remap_index 306
-#define SecondaryColor3bvEXT_remap_index 307
-#define SecondaryColor3dEXT_remap_index 308
-#define SecondaryColor3dvEXT_remap_index 309
-#define SecondaryColor3fEXT_remap_index 310
-#define SecondaryColor3fvEXT_remap_index 311
-#define SecondaryColor3iEXT_remap_index 312
-#define SecondaryColor3ivEXT_remap_index 313
-#define SecondaryColor3sEXT_remap_index 314
-#define SecondaryColor3svEXT_remap_index 315
-#define SecondaryColor3ubEXT_remap_index 316
-#define SecondaryColor3ubvEXT_remap_index 317
-#define SecondaryColor3uiEXT_remap_index 318
-#define SecondaryColor3uivEXT_remap_index 319
-#define SecondaryColor3usEXT_remap_index 320
-#define SecondaryColor3usvEXT_remap_index 321
-#define SecondaryColorPointerEXT_remap_index 322
-#define MultiDrawArraysEXT_remap_index 323
-#define MultiDrawElementsEXT_remap_index 324
-#define FogCoordPointerEXT_remap_index 325
-#define FogCoorddEXT_remap_index 326
-#define FogCoorddvEXT_remap_index 327
-#define FogCoordfEXT_remap_index 328
-#define FogCoordfvEXT_remap_index 329
-#define PixelTexGenSGIX_remap_index 330
-#define BlendFuncSeparateEXT_remap_index 331
-#define FlushVertexArrayRangeNV_remap_index 332
-#define VertexArrayRangeNV_remap_index 333
-#define CombinerInputNV_remap_index 334
-#define CombinerOutputNV_remap_index 335
-#define CombinerParameterfNV_remap_index 336
-#define CombinerParameterfvNV_remap_index 337
-#define CombinerParameteriNV_remap_index 338
-#define CombinerParameterivNV_remap_index 339
-#define FinalCombinerInputNV_remap_index 340
-#define GetCombinerInputParameterfvNV_remap_index 341
-#define GetCombinerInputParameterivNV_remap_index 342
-#define GetCombinerOutputParameterfvNV_remap_index 343
-#define GetCombinerOutputParameterivNV_remap_index 344
-#define GetFinalCombinerInputParameterfvNV_remap_index 345
-#define GetFinalCombinerInputParameterivNV_remap_index 346
-#define ResizeBuffersMESA_remap_index 347
-#define WindowPos2dMESA_remap_index 348
-#define WindowPos2dvMESA_remap_index 349
-#define WindowPos2fMESA_remap_index 350
-#define WindowPos2fvMESA_remap_index 351
-#define WindowPos2iMESA_remap_index 352
-#define WindowPos2ivMESA_remap_index 353
-#define WindowPos2sMESA_remap_index 354
-#define WindowPos2svMESA_remap_index 355
-#define WindowPos3dMESA_remap_index 356
-#define WindowPos3dvMESA_remap_index 357
-#define WindowPos3fMESA_remap_index 358
-#define WindowPos3fvMESA_remap_index 359
-#define WindowPos3iMESA_remap_index 360
-#define WindowPos3ivMESA_remap_index 361
-#define WindowPos3sMESA_remap_index 362
-#define WindowPos3svMESA_remap_index 363
-#define WindowPos4dMESA_remap_index 364
-#define WindowPos4dvMESA_remap_index 365
-#define WindowPos4fMESA_remap_index 366
-#define WindowPos4fvMESA_remap_index 367
-#define WindowPos4iMESA_remap_index 368
-#define WindowPos4ivMESA_remap_index 369
-#define WindowPos4sMESA_remap_index 370
-#define WindowPos4svMESA_remap_index 371
-#define MultiModeDrawArraysIBM_remap_index 372
-#define MultiModeDrawElementsIBM_remap_index 373
-#define DeleteFencesNV_remap_index 374
-#define FinishFenceNV_remap_index 375
-#define GenFencesNV_remap_index 376
-#define GetFenceivNV_remap_index 377
-#define IsFenceNV_remap_index 378
-#define SetFenceNV_remap_index 379
-#define TestFenceNV_remap_index 380
-#define AreProgramsResidentNV_remap_index 381
-#define BindProgramNV_remap_index 382
-#define DeleteProgramsNV_remap_index 383
-#define ExecuteProgramNV_remap_index 384
-#define GenProgramsNV_remap_index 385
-#define GetProgramParameterdvNV_remap_index 386
-#define GetProgramParameterfvNV_remap_index 387
-#define GetProgramStringNV_remap_index 388
-#define GetProgramivNV_remap_index 389
-#define GetTrackMatrixivNV_remap_index 390
-#define GetVertexAttribPointervNV_remap_index 391
-#define GetVertexAttribdvNV_remap_index 392
-#define GetVertexAttribfvNV_remap_index 393
-#define GetVertexAttribivNV_remap_index 394
-#define IsProgramNV_remap_index 395
-#define LoadProgramNV_remap_index 396
-#define ProgramParameters4dvNV_remap_index 397
-#define ProgramParameters4fvNV_remap_index 398
-#define RequestResidentProgramsNV_remap_index 399
-#define TrackMatrixNV_remap_index 400
-#define VertexAttrib1dNV_remap_index 401
-#define VertexAttrib1dvNV_remap_index 402
-#define VertexAttrib1fNV_remap_index 403
-#define VertexAttrib1fvNV_remap_index 404
-#define VertexAttrib1sNV_remap_index 405
-#define VertexAttrib1svNV_remap_index 406
-#define VertexAttrib2dNV_remap_index 407
-#define VertexAttrib2dvNV_remap_index 408
-#define VertexAttrib2fNV_remap_index 409
-#define VertexAttrib2fvNV_remap_index 410
-#define VertexAttrib2sNV_remap_index 411
-#define VertexAttrib2svNV_remap_index 412
-#define VertexAttrib3dNV_remap_index 413
-#define VertexAttrib3dvNV_remap_index 414
-#define VertexAttrib3fNV_remap_index 415
-#define VertexAttrib3fvNV_remap_index 416
-#define VertexAttrib3sNV_remap_index 417
-#define VertexAttrib3svNV_remap_index 418
-#define VertexAttrib4dNV_remap_index 419
-#define VertexAttrib4dvNV_remap_index 420
-#define VertexAttrib4fNV_remap_index 421
-#define VertexAttrib4fvNV_remap_index 422
-#define VertexAttrib4sNV_remap_index 423
-#define VertexAttrib4svNV_remap_index 424
-#define VertexAttrib4ubNV_remap_index 425
-#define VertexAttrib4ubvNV_remap_index 426
-#define VertexAttribPointerNV_remap_index 427
-#define VertexAttribs1dvNV_remap_index 428
-#define VertexAttribs1fvNV_remap_index 429
-#define VertexAttribs1svNV_remap_index 430
-#define VertexAttribs2dvNV_remap_index 431
-#define VertexAttribs2fvNV_remap_index 432
-#define VertexAttribs2svNV_remap_index 433
-#define VertexAttribs3dvNV_remap_index 434
-#define VertexAttribs3fvNV_remap_index 435
-#define VertexAttribs3svNV_remap_index 436
-#define VertexAttribs4dvNV_remap_index 437
-#define VertexAttribs4fvNV_remap_index 438
-#define VertexAttribs4svNV_remap_index 439
-#define VertexAttribs4ubvNV_remap_index 440
-#define GetTexBumpParameterfvATI_remap_index 441
-#define GetTexBumpParameterivATI_remap_index 442
-#define TexBumpParameterfvATI_remap_index 443
-#define TexBumpParameterivATI_remap_index 444
-#define AlphaFragmentOp1ATI_remap_index 445
-#define AlphaFragmentOp2ATI_remap_index 446
-#define AlphaFragmentOp3ATI_remap_index 447
-#define BeginFragmentShaderATI_remap_index 448
-#define BindFragmentShaderATI_remap_index 449
-#define ColorFragmentOp1ATI_remap_index 450
-#define ColorFragmentOp2ATI_remap_index 451
-#define ColorFragmentOp3ATI_remap_index 452
-#define DeleteFragmentShaderATI_remap_index 453
-#define EndFragmentShaderATI_remap_index 454
-#define GenFragmentShadersATI_remap_index 455
-#define PassTexCoordATI_remap_index 456
-#define SampleMapATI_remap_index 457
-#define SetFragmentShaderConstantATI_remap_index 458
-#define PointParameteriNV_remap_index 459
-#define PointParameterivNV_remap_index 460
-#define ActiveStencilFaceEXT_remap_index 461
-#define BindVertexArrayAPPLE_remap_index 462
-#define DeleteVertexArraysAPPLE_remap_index 463
-#define GenVertexArraysAPPLE_remap_index 464
-#define IsVertexArrayAPPLE_remap_index 465
-#define GetProgramNamedParameterdvNV_remap_index 466
-#define GetProgramNamedParameterfvNV_remap_index 467
-#define ProgramNamedParameter4dNV_remap_index 468
-#define ProgramNamedParameter4dvNV_remap_index 469
-#define ProgramNamedParameter4fNV_remap_index 470
-#define ProgramNamedParameter4fvNV_remap_index 471
-#define PrimitiveRestartIndexNV_remap_index 472
-#define PrimitiveRestartNV_remap_index 473
-#define DepthBoundsEXT_remap_index 474
-#define BlendEquationSeparateEXT_remap_index 475
-#define BindFramebufferEXT_remap_index 476
-#define BindRenderbufferEXT_remap_index 477
-#define CheckFramebufferStatusEXT_remap_index 478
-#define DeleteFramebuffersEXT_remap_index 479
-#define DeleteRenderbuffersEXT_remap_index 480
-#define FramebufferRenderbufferEXT_remap_index 481
-#define FramebufferTexture1DEXT_remap_index 482
-#define FramebufferTexture2DEXT_remap_index 483
-#define FramebufferTexture3DEXT_remap_index 484
-#define GenFramebuffersEXT_remap_index 485
-#define GenRenderbuffersEXT_remap_index 486
-#define GenerateMipmapEXT_remap_index 487
-#define GetFramebufferAttachmentParameterivEXT_remap_index 488
-#define GetRenderbufferParameterivEXT_remap_index 489
-#define IsFramebufferEXT_remap_index 490
-#define IsRenderbufferEXT_remap_index 491
-#define RenderbufferStorageEXT_remap_index 492
-#define BlitFramebufferEXT_remap_index 493
-#define BufferParameteriAPPLE_remap_index 494
-#define FlushMappedBufferRangeAPPLE_remap_index 495
-#define BindFragDataLocationEXT_remap_index 496
-#define GetFragDataLocationEXT_remap_index 497
-#define GetUniformuivEXT_remap_index 498
-#define GetVertexAttribIivEXT_remap_index 499
-#define GetVertexAttribIuivEXT_remap_index 500
-#define Uniform1uiEXT_remap_index 501
-#define Uniform1uivEXT_remap_index 502
-#define Uniform2uiEXT_remap_index 503
-#define Uniform2uivEXT_remap_index 504
-#define Uniform3uiEXT_remap_index 505
-#define Uniform3uivEXT_remap_index 506
-#define Uniform4uiEXT_remap_index 507
-#define Uniform4uivEXT_remap_index 508
-#define VertexAttribI1iEXT_remap_index 509
-#define VertexAttribI1ivEXT_remap_index 510
-#define VertexAttribI1uiEXT_remap_index 511
-#define VertexAttribI1uivEXT_remap_index 512
-#define VertexAttribI2iEXT_remap_index 513
-#define VertexAttribI2ivEXT_remap_index 514
-#define VertexAttribI2uiEXT_remap_index 515
-#define VertexAttribI2uivEXT_remap_index 516
-#define VertexAttribI3iEXT_remap_index 517
-#define VertexAttribI3ivEXT_remap_index 518
-#define VertexAttribI3uiEXT_remap_index 519
-#define VertexAttribI3uivEXT_remap_index 520
-#define VertexAttribI4bvEXT_remap_index 521
-#define VertexAttribI4iEXT_remap_index 522
-#define VertexAttribI4ivEXT_remap_index 523
-#define VertexAttribI4svEXT_remap_index 524
-#define VertexAttribI4ubvEXT_remap_index 525
-#define VertexAttribI4uiEXT_remap_index 526
-#define VertexAttribI4uivEXT_remap_index 527
-#define VertexAttribI4usvEXT_remap_index 528
-#define VertexAttribIPointerEXT_remap_index 529
-#define FramebufferTextureLayerEXT_remap_index 530
-#define ColorMaskIndexedEXT_remap_index 531
-#define DisableIndexedEXT_remap_index 532
-#define EnableIndexedEXT_remap_index 533
-#define GetBooleanIndexedvEXT_remap_index 534
-#define GetIntegerIndexedvEXT_remap_index 535
-#define IsEnabledIndexedEXT_remap_index 536
-#define ClearColorIiEXT_remap_index 537
-#define ClearColorIuiEXT_remap_index 538
-#define GetTexParameterIivEXT_remap_index 539
-#define GetTexParameterIuivEXT_remap_index 540
-#define TexParameterIivEXT_remap_index 541
-#define TexParameterIuivEXT_remap_index 542
-#define BeginConditionalRenderNV_remap_index 543
-#define EndConditionalRenderNV_remap_index 544
-#define BeginTransformFeedbackEXT_remap_index 545
-#define BindBufferBaseEXT_remap_index 546
-#define BindBufferOffsetEXT_remap_index 547
-#define BindBufferRangeEXT_remap_index 548
-#define EndTransformFeedbackEXT_remap_index 549
-#define GetTransformFeedbackVaryingEXT_remap_index 550
-#define TransformFeedbackVaryingsEXT_remap_index 551
-#define ProvokingVertexEXT_remap_index 552
-#define GetTexParameterPointervAPPLE_remap_index 553
-#define TextureRangeAPPLE_remap_index 554
-#define GetObjectParameterivAPPLE_remap_index 555
-#define ObjectPurgeableAPPLE_remap_index 556
-#define ObjectUnpurgeableAPPLE_remap_index 557
-#define ActiveProgramEXT_remap_index 558
-#define CreateShaderProgramEXT_remap_index 559
-#define UseShaderProgramEXT_remap_index 560
-#define TextureBarrierNV_remap_index 561
-#define StencilFuncSeparateATI_remap_index 562
-#define ProgramEnvParameters4fvEXT_remap_index 563
-#define ProgramLocalParameters4fvEXT_remap_index 564
-#define GetQueryObjecti64vEXT_remap_index 565
-#define GetQueryObjectui64vEXT_remap_index 566
-#define EGLImageTargetRenderbufferStorageOES_remap_index 567
-#define EGLImageTargetTexture2DOES_remap_index 568
+#define BindFragDataLocationIndexed_remap_index 193
+#define GetFragDataIndex_remap_index 194
+#define BindSampler_remap_index 195
+#define DeleteSamplers_remap_index 196
+#define GenSamplers_remap_index 197
+#define GetSamplerParameterIiv_remap_index 198
+#define GetSamplerParameterIuiv_remap_index 199
+#define GetSamplerParameterfv_remap_index 200
+#define GetSamplerParameteriv_remap_index 201
+#define IsSampler_remap_index 202
+#define SamplerParameterIiv_remap_index 203
+#define SamplerParameterIuiv_remap_index 204
+#define SamplerParameterf_remap_index 205
+#define SamplerParameterfv_remap_index 206
+#define SamplerParameteri_remap_index 207
+#define SamplerParameteriv_remap_index 208
+#define ColorP3ui_remap_index 209
+#define ColorP3uiv_remap_index 210
+#define ColorP4ui_remap_index 211
+#define ColorP4uiv_remap_index 212
+#define MultiTexCoordP1ui_remap_index 213
+#define MultiTexCoordP1uiv_remap_index 214
+#define MultiTexCoordP2ui_remap_index 215
+#define MultiTexCoordP2uiv_remap_index 216
+#define MultiTexCoordP3ui_remap_index 217
+#define MultiTexCoordP3uiv_remap_index 218
+#define MultiTexCoordP4ui_remap_index 219
+#define MultiTexCoordP4uiv_remap_index 220
+#define NormalP3ui_remap_index 221
+#define NormalP3uiv_remap_index 222
+#define SecondaryColorP3ui_remap_index 223
+#define SecondaryColorP3uiv_remap_index 224
+#define TexCoordP1ui_remap_index 225
+#define TexCoordP1uiv_remap_index 226
+#define TexCoordP2ui_remap_index 227
+#define TexCoordP2uiv_remap_index 228
+#define TexCoordP3ui_remap_index 229
+#define TexCoordP3uiv_remap_index 230
+#define TexCoordP4ui_remap_index 231
+#define TexCoordP4uiv_remap_index 232
+#define VertexAttribP1ui_remap_index 233
+#define VertexAttribP1uiv_remap_index 234
+#define VertexAttribP2ui_remap_index 235
+#define VertexAttribP2uiv_remap_index 236
+#define VertexAttribP3ui_remap_index 237
+#define VertexAttribP3uiv_remap_index 238
+#define VertexAttribP4ui_remap_index 239
+#define VertexAttribP4uiv_remap_index 240
+#define VertexP2ui_remap_index 241
+#define VertexP2uiv_remap_index 242
+#define VertexP3ui_remap_index 243
+#define VertexP3uiv_remap_index 244
+#define VertexP4ui_remap_index 245
+#define VertexP4uiv_remap_index 246
+#define BindTransformFeedback_remap_index 247
+#define DeleteTransformFeedbacks_remap_index 248
+#define DrawTransformFeedback_remap_index 249
+#define GenTransformFeedbacks_remap_index 250
+#define IsTransformFeedback_remap_index 251
+#define PauseTransformFeedback_remap_index 252
+#define ResumeTransformFeedback_remap_index 253
+#define ClearDepthf_remap_index 254
+#define DepthRangef_remap_index 255
+#define GetShaderPrecisionFormat_remap_index 256
+#define ReleaseShaderCompiler_remap_index 257
+#define ShaderBinary_remap_index 258
+#define DebugMessageCallbackARB_remap_index 259
+#define DebugMessageControlARB_remap_index 260
+#define DebugMessageInsertARB_remap_index 261
+#define GetDebugMessageLogARB_remap_index 262
+#define GetGraphicsResetStatusARB_remap_index 263
+#define GetnColorTableARB_remap_index 264
+#define GetnCompressedTexImageARB_remap_index 265
+#define GetnConvolutionFilterARB_remap_index 266
+#define GetnHistogramARB_remap_index 267
+#define GetnMapdvARB_remap_index 268
+#define GetnMapfvARB_remap_index 269
+#define GetnMapivARB_remap_index 270
+#define GetnMinmaxARB_remap_index 271
+#define GetnPixelMapfvARB_remap_index 272
+#define GetnPixelMapuivARB_remap_index 273
+#define GetnPixelMapusvARB_remap_index 274
+#define GetnPolygonStippleARB_remap_index 275
+#define GetnSeparableFilterARB_remap_index 276
+#define GetnTexImageARB_remap_index 277
+#define GetnUniformdvARB_remap_index 278
+#define GetnUniformfvARB_remap_index 279
+#define GetnUniformivARB_remap_index 280
+#define GetnUniformuivARB_remap_index 281
+#define ReadnPixelsARB_remap_index 282
+#define TexStorage1D_remap_index 283
+#define TexStorage2D_remap_index 284
+#define TexStorage3D_remap_index 285
+#define TextureStorage1DEXT_remap_index 286
+#define TextureStorage2DEXT_remap_index 287
+#define TextureStorage3DEXT_remap_index 288
+#define PolygonOffsetEXT_remap_index 289
+#define GetPixelTexGenParameterfvSGIS_remap_index 290
+#define GetPixelTexGenParameterivSGIS_remap_index 291
+#define PixelTexGenParameterfSGIS_remap_index 292
+#define PixelTexGenParameterfvSGIS_remap_index 293
+#define PixelTexGenParameteriSGIS_remap_index 294
+#define PixelTexGenParameterivSGIS_remap_index 295
+#define SampleMaskSGIS_remap_index 296
+#define SamplePatternSGIS_remap_index 297
+#define ColorPointerEXT_remap_index 298
+#define EdgeFlagPointerEXT_remap_index 299
+#define IndexPointerEXT_remap_index 300
+#define NormalPointerEXT_remap_index 301
+#define TexCoordPointerEXT_remap_index 302
+#define VertexPointerEXT_remap_index 303
+#define PointParameterfEXT_remap_index 304
+#define PointParameterfvEXT_remap_index 305
+#define LockArraysEXT_remap_index 306
+#define UnlockArraysEXT_remap_index 307
+#define SecondaryColor3bEXT_remap_index 308
+#define SecondaryColor3bvEXT_remap_index 309
+#define SecondaryColor3dEXT_remap_index 310
+#define SecondaryColor3dvEXT_remap_index 311
+#define SecondaryColor3fEXT_remap_index 312
+#define SecondaryColor3fvEXT_remap_index 313
+#define SecondaryColor3iEXT_remap_index 314
+#define SecondaryColor3ivEXT_remap_index 315
+#define SecondaryColor3sEXT_remap_index 316
+#define SecondaryColor3svEXT_remap_index 317
+#define SecondaryColor3ubEXT_remap_index 318
+#define SecondaryColor3ubvEXT_remap_index 319
+#define SecondaryColor3uiEXT_remap_index 320
+#define SecondaryColor3uivEXT_remap_index 321
+#define SecondaryColor3usEXT_remap_index 322
+#define SecondaryColor3usvEXT_remap_index 323
+#define SecondaryColorPointerEXT_remap_index 324
+#define MultiDrawArraysEXT_remap_index 325
+#define MultiDrawElementsEXT_remap_index 326
+#define FogCoordPointerEXT_remap_index 327
+#define FogCoorddEXT_remap_index 328
+#define FogCoorddvEXT_remap_index 329
+#define FogCoordfEXT_remap_index 330
+#define FogCoordfvEXT_remap_index 331
+#define PixelTexGenSGIX_remap_index 332
+#define BlendFuncSeparateEXT_remap_index 333
+#define FlushVertexArrayRangeNV_remap_index 334
+#define VertexArrayRangeNV_remap_index 335
+#define CombinerInputNV_remap_index 336
+#define CombinerOutputNV_remap_index 337
+#define CombinerParameterfNV_remap_index 338
+#define CombinerParameterfvNV_remap_index 339
+#define CombinerParameteriNV_remap_index 340
+#define CombinerParameterivNV_remap_index 341
+#define FinalCombinerInputNV_remap_index 342
+#define GetCombinerInputParameterfvNV_remap_index 343
+#define GetCombinerInputParameterivNV_remap_index 344
+#define GetCombinerOutputParameterfvNV_remap_index 345
+#define GetCombinerOutputParameterivNV_remap_index 346
+#define GetFinalCombinerInputParameterfvNV_remap_index 347
+#define GetFinalCombinerInputParameterivNV_remap_index 348
+#define ResizeBuffersMESA_remap_index 349
+#define WindowPos2dMESA_remap_index 350
+#define WindowPos2dvMESA_remap_index 351
+#define WindowPos2fMESA_remap_index 352
+#define WindowPos2fvMESA_remap_index 353
+#define WindowPos2iMESA_remap_index 354
+#define WindowPos2ivMESA_remap_index 355
+#define WindowPos2sMESA_remap_index 356
+#define WindowPos2svMESA_remap_index 357
+#define WindowPos3dMESA_remap_index 358
+#define WindowPos3dvMESA_remap_index 359
+#define WindowPos3fMESA_remap_index 360
+#define WindowPos3fvMESA_remap_index 361
+#define WindowPos3iMESA_remap_index 362
+#define WindowPos3ivMESA_remap_index 363
+#define WindowPos3sMESA_remap_index 364
+#define WindowPos3svMESA_remap_index 365
+#define WindowPos4dMESA_remap_index 366
+#define WindowPos4dvMESA_remap_index 367
+#define WindowPos4fMESA_remap_index 368
+#define WindowPos4fvMESA_remap_index 369
+#define WindowPos4iMESA_remap_index 370
+#define WindowPos4ivMESA_remap_index 371
+#define WindowPos4sMESA_remap_index 372
+#define WindowPos4svMESA_remap_index 373
+#define MultiModeDrawArraysIBM_remap_index 374
+#define MultiModeDrawElementsIBM_remap_index 375
+#define DeleteFencesNV_remap_index 376
+#define FinishFenceNV_remap_index 377
+#define GenFencesNV_remap_index 378
+#define GetFenceivNV_remap_index 379
+#define IsFenceNV_remap_index 380
+#define SetFenceNV_remap_index 381
+#define TestFenceNV_remap_index 382
+#define AreProgramsResidentNV_remap_index 383
+#define BindProgramNV_remap_index 384
+#define DeleteProgramsNV_remap_index 385
+#define ExecuteProgramNV_remap_index 386
+#define GenProgramsNV_remap_index 387
+#define GetProgramParameterdvNV_remap_index 388
+#define GetProgramParameterfvNV_remap_index 389
+#define GetProgramStringNV_remap_index 390
+#define GetProgramivNV_remap_index 391
+#define GetTrackMatrixivNV_remap_index 392
+#define GetVertexAttribPointervNV_remap_index 393
+#define GetVertexAttribdvNV_remap_index 394
+#define GetVertexAttribfvNV_remap_index 395
+#define GetVertexAttribivNV_remap_index 396
+#define IsProgramNV_remap_index 397
+#define LoadProgramNV_remap_index 398
+#define ProgramParameters4dvNV_remap_index 399
+#define ProgramParameters4fvNV_remap_index 400
+#define RequestResidentProgramsNV_remap_index 401
+#define TrackMatrixNV_remap_index 402
+#define VertexAttrib1dNV_remap_index 403
+#define VertexAttrib1dvNV_remap_index 404
+#define VertexAttrib1fNV_remap_index 405
+#define VertexAttrib1fvNV_remap_index 406
+#define VertexAttrib1sNV_remap_index 407
+#define VertexAttrib1svNV_remap_index 408
+#define VertexAttrib2dNV_remap_index 409
+#define VertexAttrib2dvNV_remap_index 410
+#define VertexAttrib2fNV_remap_index 411
+#define VertexAttrib2fvNV_remap_index 412
+#define VertexAttrib2sNV_remap_index 413
+#define VertexAttrib2svNV_remap_index 414
+#define VertexAttrib3dNV_remap_index 415
+#define VertexAttrib3dvNV_remap_index 416
+#define VertexAttrib3fNV_remap_index 417
+#define VertexAttrib3fvNV_remap_index 418
+#define VertexAttrib3sNV_remap_index 419
+#define VertexAttrib3svNV_remap_index 420
+#define VertexAttrib4dNV_remap_index 421
+#define VertexAttrib4dvNV_remap_index 422
+#define VertexAttrib4fNV_remap_index 423
+#define VertexAttrib4fvNV_remap_index 424
+#define VertexAttrib4sNV_remap_index 425
+#define VertexAttrib4svNV_remap_index 426
+#define VertexAttrib4ubNV_remap_index 427
+#define VertexAttrib4ubvNV_remap_index 428
+#define VertexAttribPointerNV_remap_index 429
+#define VertexAttribs1dvNV_remap_index 430
+#define VertexAttribs1fvNV_remap_index 431
+#define VertexAttribs1svNV_remap_index 432
+#define VertexAttribs2dvNV_remap_index 433
+#define VertexAttribs2fvNV_remap_index 434
+#define VertexAttribs2svNV_remap_index 435
+#define VertexAttribs3dvNV_remap_index 436
+#define VertexAttribs3fvNV_remap_index 437
+#define VertexAttribs3svNV_remap_index 438
+#define VertexAttribs4dvNV_remap_index 439
+#define VertexAttribs4fvNV_remap_index 440
+#define VertexAttribs4svNV_remap_index 441
+#define VertexAttribs4ubvNV_remap_index 442
+#define GetTexBumpParameterfvATI_remap_index 443
+#define GetTexBumpParameterivATI_remap_index 444
+#define TexBumpParameterfvATI_remap_index 445
+#define TexBumpParameterivATI_remap_index 446
+#define AlphaFragmentOp1ATI_remap_index 447
+#define AlphaFragmentOp2ATI_remap_index 448
+#define AlphaFragmentOp3ATI_remap_index 449
+#define BeginFragmentShaderATI_remap_index 450
+#define BindFragmentShaderATI_remap_index 451
+#define ColorFragmentOp1ATI_remap_index 452
+#define ColorFragmentOp2ATI_remap_index 453
+#define ColorFragmentOp3ATI_remap_index 454
+#define DeleteFragmentShaderATI_remap_index 455
+#define EndFragmentShaderATI_remap_index 456
+#define GenFragmentShadersATI_remap_index 457
+#define PassTexCoordATI_remap_index 458
+#define SampleMapATI_remap_index 459
+#define SetFragmentShaderConstantATI_remap_index 460
+#define PointParameteriNV_remap_index 461
+#define PointParameterivNV_remap_index 462
+#define ActiveStencilFaceEXT_remap_index 463
+#define BindVertexArrayAPPLE_remap_index 464
+#define DeleteVertexArraysAPPLE_remap_index 465
+#define GenVertexArraysAPPLE_remap_index 466
+#define IsVertexArrayAPPLE_remap_index 467
+#define GetProgramNamedParameterdvNV_remap_index 468
+#define GetProgramNamedParameterfvNV_remap_index 469
+#define ProgramNamedParameter4dNV_remap_index 470
+#define ProgramNamedParameter4dvNV_remap_index 471
+#define ProgramNamedParameter4fNV_remap_index 472
+#define ProgramNamedParameter4fvNV_remap_index 473
+#define PrimitiveRestartIndexNV_remap_index 474
+#define PrimitiveRestartNV_remap_index 475
+#define DepthBoundsEXT_remap_index 476
+#define BlendEquationSeparateEXT_remap_index 477
+#define BindFramebufferEXT_remap_index 478
+#define BindRenderbufferEXT_remap_index 479
+#define CheckFramebufferStatusEXT_remap_index 480
+#define DeleteFramebuffersEXT_remap_index 481
+#define DeleteRenderbuffersEXT_remap_index 482
+#define FramebufferRenderbufferEXT_remap_index 483
+#define FramebufferTexture1DEXT_remap_index 484
+#define FramebufferTexture2DEXT_remap_index 485
+#define FramebufferTexture3DEXT_remap_index 486
+#define GenFramebuffersEXT_remap_index 487
+#define GenRenderbuffersEXT_remap_index 488
+#define GenerateMipmapEXT_remap_index 489
+#define GetFramebufferAttachmentParameterivEXT_remap_index 490
+#define GetRenderbufferParameterivEXT_remap_index 491
+#define IsFramebufferEXT_remap_index 492
+#define IsRenderbufferEXT_remap_index 493
+#define RenderbufferStorageEXT_remap_index 494
+#define BlitFramebufferEXT_remap_index 495
+#define BufferParameteriAPPLE_remap_index 496
+#define FlushMappedBufferRangeAPPLE_remap_index 497
+#define BindFragDataLocationEXT_remap_index 498
+#define GetFragDataLocationEXT_remap_index 499
+#define GetUniformuivEXT_remap_index 500
+#define GetVertexAttribIivEXT_remap_index 501
+#define GetVertexAttribIuivEXT_remap_index 502
+#define Uniform1uiEXT_remap_index 503
+#define Uniform1uivEXT_remap_index 504
+#define Uniform2uiEXT_remap_index 505
+#define Uniform2uivEXT_remap_index 506
+#define Uniform3uiEXT_remap_index 507
+#define Uniform3uivEXT_remap_index 508
+#define Uniform4uiEXT_remap_index 509
+#define Uniform4uivEXT_remap_index 510
+#define VertexAttribI1iEXT_remap_index 511
+#define VertexAttribI1ivEXT_remap_index 512
+#define VertexAttribI1uiEXT_remap_index 513
+#define VertexAttribI1uivEXT_remap_index 514
+#define VertexAttribI2iEXT_remap_index 515
+#define VertexAttribI2ivEXT_remap_index 516
+#define VertexAttribI2uiEXT_remap_index 517
+#define VertexAttribI2uivEXT_remap_index 518
+#define VertexAttribI3iEXT_remap_index 519
+#define VertexAttribI3ivEXT_remap_index 520
+#define VertexAttribI3uiEXT_remap_index 521
+#define VertexAttribI3uivEXT_remap_index 522
+#define VertexAttribI4bvEXT_remap_index 523
+#define VertexAttribI4iEXT_remap_index 524
+#define VertexAttribI4ivEXT_remap_index 525
+#define VertexAttribI4svEXT_remap_index 526
+#define VertexAttribI4ubvEXT_remap_index 527
+#define VertexAttribI4uiEXT_remap_index 528
+#define VertexAttribI4uivEXT_remap_index 529
+#define VertexAttribI4usvEXT_remap_index 530
+#define VertexAttribIPointerEXT_remap_index 531
+#define FramebufferTextureLayerEXT_remap_index 532
+#define ColorMaskIndexedEXT_remap_index 533
+#define DisableIndexedEXT_remap_index 534
+#define EnableIndexedEXT_remap_index 535
+#define GetBooleanIndexedvEXT_remap_index 536
+#define GetIntegerIndexedvEXT_remap_index 537
+#define IsEnabledIndexedEXT_remap_index 538
+#define ClearColorIiEXT_remap_index 539
+#define ClearColorIuiEXT_remap_index 540
+#define GetTexParameterIivEXT_remap_index 541
+#define GetTexParameterIuivEXT_remap_index 542
+#define TexParameterIivEXT_remap_index 543
+#define TexParameterIuivEXT_remap_index 544
+#define BeginConditionalRenderNV_remap_index 545
+#define EndConditionalRenderNV_remap_index 546
+#define BeginTransformFeedbackEXT_remap_index 547
+#define BindBufferBaseEXT_remap_index 548
+#define BindBufferOffsetEXT_remap_index 549
+#define BindBufferRangeEXT_remap_index 550
+#define EndTransformFeedbackEXT_remap_index 551
+#define GetTransformFeedbackVaryingEXT_remap_index 552
+#define TransformFeedbackVaryingsEXT_remap_index 553
+#define ProvokingVertexEXT_remap_index 554
+#define GetTexParameterPointervAPPLE_remap_index 555
+#define TextureRangeAPPLE_remap_index 556
+#define GetObjectParameterivAPPLE_remap_index 557
+#define ObjectPurgeableAPPLE_remap_index 558
+#define ObjectUnpurgeableAPPLE_remap_index 559
+#define ActiveProgramEXT_remap_index 560
+#define CreateShaderProgramEXT_remap_index 561
+#define UseShaderProgramEXT_remap_index 562
+#define TextureBarrierNV_remap_index 563
+#define StencilFuncSeparateATI_remap_index 564
+#define ProgramEnvParameters4fvEXT_remap_index 565
+#define ProgramLocalParameters4fvEXT_remap_index 566
+#define GetQueryObjecti64vEXT_remap_index 567
+#define GetQueryObjectui64vEXT_remap_index 568
+#define EGLImageTargetRenderbufferStorageOES_remap_index 569
+#define EGLImageTargetTexture2DOES_remap_index 570
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1814,6 +1818,8 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_BlendEquationiARB driDispatchRemapTable[BlendEquationiARB_remap_index]
 #define _gloffset_BlendFuncSeparateiARB driDispatchRemapTable[BlendFuncSeparateiARB_remap_index]
 #define _gloffset_BlendFunciARB driDispatchRemapTable[BlendFunciARB_remap_index]
+#define _gloffset_BindFragDataLocationIndexed driDispatchRemapTable[BindFragDataLocationIndexed_remap_index]
+#define _gloffset_GetFragDataIndex driDispatchRemapTable[GetFragDataIndex_remap_index]
 #define _gloffset_BindSampler driDispatchRemapTable[BindSampler_remap_index]
 #define _gloffset_DeleteSamplers driDispatchRemapTable[DeleteSamplers_remap_index]
 #define _gloffset_GenSamplers driDispatchRemapTable[GenSamplers_remap_index]
@@ -8804,6 +8810,28 @@ static inline void SET_BlendFunciARB(struct _glapi_table *disp, void (GLAPIENTRY
    SET_by_offset(disp, _gloffset_BlendFunciARB, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_BindFragDataLocationIndexed)(GLuint, GLuint, GLuint, const GLchar *);
+#define CALL_BindFragDataLocationIndexed(disp, parameters) \
+    (* GET_BindFragDataLocationIndexed(disp)) parameters
+static inline _glptr_BindFragDataLocationIndexed GET_BindFragDataLocationIndexed(struct _glapi_table *disp) {
+   return (_glptr_BindFragDataLocationIndexed) (GET_by_offset(disp, _gloffset_BindFragDataLocationIndexed));
+}
+
+static inline void SET_BindFragDataLocationIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_BindFragDataLocationIndexed, fn);
+}
+
+typedef GLint (GLAPIENTRYP _glptr_GetFragDataIndex)(GLuint, const GLchar *);
+#define CALL_GetFragDataIndex(disp, parameters) \
+    (* GET_GetFragDataIndex(disp)) parameters
+static inline _glptr_GetFragDataIndex GET_GetFragDataIndex(struct _glapi_table *disp) {
+   return (_glptr_GetFragDataIndex) (GET_by_offset(disp, _gloffset_GetFragDataIndex));
+}
+
+static inline void SET_GetFragDataIndex(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetFragDataIndex, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_BindSampler)(GLuint, GLuint);
 #define CALL_BindSampler(disp, parameters) \
     (* GET_BindSampler(disp)) parameters
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index d2a2773fa..4d2167adb 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -73,9 +73,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ALPHA12\0"
    "GL_ALPHA12_EXT\0"
    "GL_ALPHA16\0"
+   "GL_ALPHA16F_ARB\0"
    "GL_ALPHA16I_EXT\0"
    "GL_ALPHA16UI_EXT\0"
    "GL_ALPHA16_EXT\0"
+   "GL_ALPHA32F_ARB\0"
    "GL_ALPHA32I_EXT\0"
    "GL_ALPHA32UI_EXT\0"
    "GL_ALPHA4\0"
@@ -336,6 +338,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COMPRESSED_LUMINANCE_ALPHA_ARB\0"
    "GL_COMPRESSED_LUMINANCE_ARB\0"
    "GL_COMPRESSED_RED\0"
+   "GL_COMPRESSED_RED_RGTC1\0"
    "GL_COMPRESSED_RG\0"
    "GL_COMPRESSED_RGB\0"
    "GL_COMPRESSED_RGBA\0"
@@ -347,6 +350,9 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COMPRESSED_RGB_ARB\0"
    "GL_COMPRESSED_RGB_FXT1_3DFX\0"
    "GL_COMPRESSED_RGB_S3TC_DXT1_EXT\0"
+   "GL_COMPRESSED_RG_RGTC2\0"
+   "GL_COMPRESSED_SIGNED_RED_RGTC1\0"
+   "GL_COMPRESSED_SIGNED_RG_RGTC2\0"
    "GL_COMPRESSED_SLUMINANCE\0"
    "GL_COMPRESSED_SLUMINANCE_ALPHA\0"
    "GL_COMPRESSED_SRGB\0"
@@ -460,6 +466,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH24_STENCIL8\0"
    "GL_DEPTH24_STENCIL8_EXT\0"
    "GL_DEPTH24_STENCIL8_OES\0"
+   "GL_DEPTH32F_STENCIL8\0"
    "GL_DEPTH_ATTACHMENT\0"
    "GL_DEPTH_ATTACHMENT_EXT\0"
    "GL_DEPTH_ATTACHMENT_OES\0"
@@ -482,6 +489,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_DEPTH_COMPONENT24_OES\0"
    "GL_DEPTH_COMPONENT24_SGIX\0"
    "GL_DEPTH_COMPONENT32\0"
+   "GL_DEPTH_COMPONENT32F\0"
    "GL_DEPTH_COMPONENT32_ARB\0"
    "GL_DEPTH_COMPONENT32_OES\0"
    "GL_DEPTH_COMPONENT32_SGIX\0"
@@ -628,6 +636,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_FIXED_ONLY_ARB\0"
    "GL_FLAT\0"
    "GL_FLOAT\0"
+   "GL_FLOAT_32_UNSIGNED_INT_24_8_REV\0"
    "GL_FLOAT_MAT2\0"
    "GL_FLOAT_MAT2_ARB\0"
    "GL_FLOAT_MAT2x3\0"
@@ -832,9 +841,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_INTENSITY12\0"
    "GL_INTENSITY12_EXT\0"
    "GL_INTENSITY16\0"
+   "GL_INTENSITY16F_ARB\0"
    "GL_INTENSITY16I_EXT\0"
    "GL_INTENSITY16UI_EXT\0"
    "GL_INTENSITY16_EXT\0"
+   "GL_INTENSITY32F_ARB\0"
    "GL_INTENSITY32I_EXT\0"
    "GL_INTENSITY32UI_EXT\0"
    "GL_INTENSITY4\0"
@@ -948,11 +959,13 @@ LONGSTRING static const char enum_string_table[] =
    "GL_LUMINANCE12_ALPHA4_EXT\0"
    "GL_LUMINANCE12_EXT\0"
    "GL_LUMINANCE16\0"
+   "GL_LUMINANCE16F_ARB\0"
    "GL_LUMINANCE16I_EXT\0"
    "GL_LUMINANCE16UI_EXT\0"
    "GL_LUMINANCE16_ALPHA16\0"
    "GL_LUMINANCE16_ALPHA16_EXT\0"
    "GL_LUMINANCE16_EXT\0"
+   "GL_LUMINANCE32F_ARB\0"
    "GL_LUMINANCE32I_EXT\0"
    "GL_LUMINANCE32UI_EXT\0"
    "GL_LUMINANCE4\0"
@@ -968,8 +981,10 @@ LONGSTRING static const char enum_string_table[] =
    "GL_LUMINANCE8_ALPHA8_EXT\0"
    "GL_LUMINANCE8_EXT\0"
    "GL_LUMINANCE_ALPHA\0"
+   "GL_LUMINANCE_ALPHA16F_ARB\0"
    "GL_LUMINANCE_ALPHA16I_EXT\0"
    "GL_LUMINANCE_ALPHA16UI_EXT\0"
+   "GL_LUMINANCE_ALPHA32F_ARB\0"
    "GL_LUMINANCE_ALPHA32I_EXT\0"
    "GL_LUMINANCE_ALPHA32UI_EXT\0"
    "GL_LUMINANCE_ALPHA8I_EXT\0"
@@ -1123,6 +1138,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_DRAW_BUFFERS_ARB\0"
    "GL_MAX_DRAW_BUFFERS_ATI\0"
    "GL_MAX_DRAW_BUFFERS_NV\0"
+   "GL_MAX_DUAL_SOURCE_DRAW_BUFFERS\0"
    "GL_MAX_ELEMENTS_INDICES\0"
    "GL_MAX_ELEMENTS_VERTICES\0"
    "GL_MAX_EVAL_ORDER\0"
@@ -1353,6 +1369,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ONE_MINUS_CONSTANT_COLOR_EXT\0"
    "GL_ONE_MINUS_DST_ALPHA\0"
    "GL_ONE_MINUS_DST_COLOR\0"
+   "GL_ONE_MINUS_SRC1_ALPHA\0"
+   "GL_ONE_MINUS_SRC1_COLOR\0"
    "GL_ONE_MINUS_SRC_ALPHA\0"
    "GL_ONE_MINUS_SRC_COLOR\0"
    "GL_OPERAND0_ALPHA\0"
@@ -1619,8 +1637,18 @@ LONGSTRING static const char enum_string_table[] =
    "GL_QUERY_WAIT_NV\0"
    "GL_R\0"
    "GL_R11F_G11F_B10F\0"
+   "GL_R16\0"
+   "GL_R16F\0"
+   "GL_R16I\0"
+   "GL_R16UI\0"
    "GL_R16_SNORM\0"
+   "GL_R32F\0"
+   "GL_R32I\0"
+   "GL_R32UI\0"
    "GL_R3_G3_B2\0"
+   "GL_R8\0"
+   "GL_R8I\0"
+   "GL_R8UI\0"
    "GL_R8_SNORM\0"
    "GL_RASTERIZER_DISCARD\0"
    "GL_RASTERIZER_DISCARD_EXT\0"
@@ -1690,7 +1718,18 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RESET_NOTIFICATION_STRATEGY_ARB\0"
    "GL_RETAINED_APPLE\0"
    "GL_RETURN\0"
+   "GL_RG\0"
+   "GL_RG16\0"
+   "GL_RG16F\0"
+   "GL_RG16I\0"
+   "GL_RG16UI\0"
    "GL_RG16_SNORM\0"
+   "GL_RG32F\0"
+   "GL_RG32I\0"
+   "GL_RG32UI\0"
+   "GL_RG8\0"
+   "GL_RG8I\0"
+   "GL_RG8UI\0"
    "GL_RG8_SNORM\0"
    "GL_RGB\0"
    "GL_RGB10\0"
@@ -1702,6 +1741,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGB12_EXT\0"
    "GL_RGB16\0"
    "GL_RGB16F\0"
+   "GL_RGB16F_ARB\0"
    "GL_RGB16I\0"
    "GL_RGB16I_EXT\0"
    "GL_RGB16UI\0"
@@ -1710,6 +1750,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGB16_SNORM\0"
    "GL_RGB2_EXT\0"
    "GL_RGB32F\0"
+   "GL_RGB32F_ARB\0"
    "GL_RGB32I\0"
    "GL_RGB32I_EXT\0"
    "GL_RGB32UI\0"
@@ -1738,6 +1779,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGBA12_EXT\0"
    "GL_RGBA16\0"
    "GL_RGBA16F\0"
+   "GL_RGBA16F_ARB\0"
    "GL_RGBA16I\0"
    "GL_RGBA16I_EXT\0"
    "GL_RGBA16UI\0"
@@ -1747,6 +1789,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGBA2\0"
    "GL_RGBA2_EXT\0"
    "GL_RGBA32F\0"
+   "GL_RGBA32F_ARB\0"
    "GL_RGBA32I\0"
    "GL_RGBA32I_EXT\0"
    "GL_RGBA32UI\0"
@@ -1779,6 +1822,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_RGB_SCALE_ARB\0"
    "GL_RGB_SCALE_EXT\0"
    "GL_RGB_SNORM\0"
+   "GL_RG_INTEGER\0"
    "GL_RG_SNORM\0"
    "GL_RIGHT\0"
    "GL_S\0"
@@ -1895,6 +1939,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SRC0_ALPHA\0"
    "GL_SRC0_RGB\0"
    "GL_SRC1_ALPHA\0"
+   "GL_SRC1_COLOR\0"
    "GL_SRC1_RGB\0"
    "GL_SRC2_ALPHA\0"
    "GL_SRC2_RGB\0"
@@ -2057,6 +2102,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_3D_OES\0"
    "GL_TEXTURE_ALPHA_SIZE\0"
    "GL_TEXTURE_ALPHA_SIZE_EXT\0"
+   "GL_TEXTURE_ALPHA_TYPE\0"
+   "GL_TEXTURE_ALPHA_TYPE_ARB\0"
    "GL_TEXTURE_BASE_LEVEL\0"
    "GL_TEXTURE_BINDING_1D\0"
    "GL_TEXTURE_BINDING_1D_ARRAY\0"
@@ -2078,6 +2125,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_BIT\0"
    "GL_TEXTURE_BLUE_SIZE\0"
    "GL_TEXTURE_BLUE_SIZE_EXT\0"
+   "GL_TEXTURE_BLUE_TYPE\0"
+   "GL_TEXTURE_BLUE_TYPE_ARB\0"
    "GL_TEXTURE_BORDER\0"
    "GL_TEXTURE_BORDER_COLOR\0"
    "GL_TEXTURE_BUFFER\0"
@@ -2142,6 +2191,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_DEPTH\0"
    "GL_TEXTURE_DEPTH_SIZE\0"
    "GL_TEXTURE_DEPTH_SIZE_ARB\0"
+   "GL_TEXTURE_DEPTH_TYPE\0"
+   "GL_TEXTURE_DEPTH_TYPE_ARB\0"
    "GL_TEXTURE_ENV\0"
    "GL_TEXTURE_ENV_COLOR\0"
    "GL_TEXTURE_ENV_MODE\0"
@@ -2158,10 +2209,14 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_GEQUAL_R_SGIX\0"
    "GL_TEXTURE_GREEN_SIZE\0"
    "GL_TEXTURE_GREEN_SIZE_EXT\0"
+   "GL_TEXTURE_GREEN_TYPE\0"
+   "GL_TEXTURE_GREEN_TYPE_ARB\0"
    "GL_TEXTURE_HEIGHT\0"
    "GL_TEXTURE_INDEX_SIZE_EXT\0"
    "GL_TEXTURE_INTENSITY_SIZE\0"
    "GL_TEXTURE_INTENSITY_SIZE_EXT\0"
+   "GL_TEXTURE_INTENSITY_TYPE\0"
+   "GL_TEXTURE_INTENSITY_TYPE_ARB\0"
    "GL_TEXTURE_INTERNAL_FORMAT\0"
    "GL_TEXTURE_LEQUAL_R_SGIX\0"
    "GL_TEXTURE_LOD_BIAS\0"
@@ -2171,6 +2226,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_LOD_BIAS_T_SGIX\0"
    "GL_TEXTURE_LUMINANCE_SIZE\0"
    "GL_TEXTURE_LUMINANCE_SIZE_EXT\0"
+   "GL_TEXTURE_LUMINANCE_TYPE\0"
+   "GL_TEXTURE_LUMINANCE_TYPE_ARB\0"
    "GL_TEXTURE_MAG_FILTER\0"
    "GL_TEXTURE_MATRIX\0"
    "GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES\0"
@@ -2190,6 +2247,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_RECTANGLE_NV\0"
    "GL_TEXTURE_RED_SIZE\0"
    "GL_TEXTURE_RED_SIZE_EXT\0"
+   "GL_TEXTURE_RED_TYPE\0"
+   "GL_TEXTURE_RED_TYPE_ARB\0"
    "GL_TEXTURE_RESIDENT\0"
    "GL_TEXTURE_SHARED_SIZE\0"
    "GL_TEXTURE_STACK_DEPTH\0"
@@ -2297,6 +2356,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_UNSIGNED_INT_VEC4\0"
    "GL_UNSIGNED_INT_VEC4_EXT\0"
    "GL_UNSIGNED_NORMALIZED\0"
+   "GL_UNSIGNED_NORMALIZED_ARB\0"
    "GL_UNSIGNED_SHORT\0"
    "GL_UNSIGNED_SHORT_1_5_5_5_REV\0"
    "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT\0"
@@ -2401,7 +2461,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2362] =
+static const enum_elt all_enums[2422] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2439,3929 +2499,4037 @@ static const enum_elt all_enums[2362] =
    {   607, 0x0000803D }, /* GL_ALPHA12 */
    {   618, 0x0000803D }, /* GL_ALPHA12_EXT */
    {   633, 0x0000803E }, /* GL_ALPHA16 */
-   {   644, 0x00008D8A }, /* GL_ALPHA16I_EXT */
-   {   660, 0x00008D78 }, /* GL_ALPHA16UI_EXT */
-   {   677, 0x0000803E }, /* GL_ALPHA16_EXT */
-   {   692, 0x00008D84 }, /* GL_ALPHA32I_EXT */
-   {   708, 0x00008D72 }, /* GL_ALPHA32UI_EXT */
-   {   725, 0x0000803B }, /* GL_ALPHA4 */
-   {   735, 0x0000803B }, /* GL_ALPHA4_EXT */
-   {   749, 0x0000803C }, /* GL_ALPHA8 */
-   {   759, 0x00008D90 }, /* GL_ALPHA8I_EXT */
-   {   774, 0x00008D7E }, /* GL_ALPHA8UI_EXT */
-   {   790, 0x0000803C }, /* GL_ALPHA8_EXT */
-   {   804, 0x00000D1D }, /* GL_ALPHA_BIAS */
-   {   818, 0x00000D55 }, /* GL_ALPHA_BITS */
-   {   832, 0x00008D97 }, /* GL_ALPHA_INTEGER_EXT */
-   {   853, 0x00000D1C }, /* GL_ALPHA_SCALE */
-   {   868, 0x00000BC0 }, /* GL_ALPHA_TEST */
-   {   882, 0x00000BC1 }, /* GL_ALPHA_TEST_FUNC */
-   {   901, 0x00000BC2 }, /* GL_ALPHA_TEST_REF */
-   {   919, 0x0000911A }, /* GL_ALREADY_SIGNALED */
-   {   939, 0x00000207 }, /* GL_ALWAYS */
-   {   949, 0x00001200 }, /* GL_AMBIENT */
-   {   960, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
-   {   983, 0x00001501 }, /* GL_AND */
-   {   990, 0x00001504 }, /* GL_AND_INVERTED */
-   {  1006, 0x00001502 }, /* GL_AND_REVERSE */
-   {  1021, 0x00008892 }, /* GL_ARRAY_BUFFER */
-   {  1037, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
-   {  1061, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
-   {  1089, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
-   {  1109, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
-   {  1136, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
-   {  1160, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
-   {  1186, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
-   {  1210, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
-   {  1232, 0x00000D80 }, /* GL_AUTO_NORMAL */
-   {  1247, 0x00000409 }, /* GL_AUX0 */
-   {  1255, 0x0000040A }, /* GL_AUX1 */
-   {  1263, 0x0000040B }, /* GL_AUX2 */
-   {  1271, 0x0000040C }, /* GL_AUX3 */
-   {  1279, 0x00000C00 }, /* GL_AUX_BUFFERS */
-   {  1294, 0x00000405 }, /* GL_BACK */
-   {  1302, 0x00000402 }, /* GL_BACK_LEFT */
-   {  1315, 0x00000403 }, /* GL_BACK_RIGHT */
-   {  1329, 0x000080E0 }, /* GL_BGR */
-   {  1336, 0x000080E1 }, /* GL_BGRA */
-   {  1344, 0x000080E1 }, /* GL_BGRA_EXT */
-   {  1356, 0x00008D9B }, /* GL_BGRA_INTEGER */
-   {  1372, 0x00008D9B }, /* GL_BGRA_INTEGER_EXT */
-   {  1392, 0x00008D9A }, /* GL_BGR_INTEGER */
-   {  1407, 0x00008D9A }, /* GL_BGR_INTEGER_EXT */
-   {  1426, 0x00001A00 }, /* GL_BITMAP */
-   {  1436, 0x00000704 }, /* GL_BITMAP_TOKEN */
-   {  1452, 0x00000BE2 }, /* GL_BLEND */
-   {  1461, 0x00008005 }, /* GL_BLEND_COLOR */
-   {  1476, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
-   {  1495, 0x00000BE0 }, /* GL_BLEND_DST */
-   {  1508, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
-   {  1527, 0x000080CA }, /* GL_BLEND_DST_ALPHA_OES */
-   {  1550, 0x000080C8 }, /* GL_BLEND_DST_RGB */
-   {  1567, 0x000080C8 }, /* GL_BLEND_DST_RGB_OES */
-   {  1588, 0x00008009 }, /* GL_BLEND_EQUATION */
-   {  1606, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
-   {  1630, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
-   {  1658, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_OES */
-   {  1686, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
-   {  1708, 0x00008009 }, /* GL_BLEND_EQUATION_OES */
-   {  1730, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
-   {  1752, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
-   {  1778, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_OES */
-   {  1804, 0x00000BE1 }, /* GL_BLEND_SRC */
-   {  1817, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
-   {  1836, 0x000080CB }, /* GL_BLEND_SRC_ALPHA_OES */
-   {  1859, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
-   {  1876, 0x000080C9 }, /* GL_BLEND_SRC_RGB_OES */
-   {  1897, 0x00001905 }, /* GL_BLUE */
-   {  1905, 0x00000D1B }, /* GL_BLUE_BIAS */
-   {  1918, 0x00000D54 }, /* GL_BLUE_BITS */
-   {  1931, 0x00008D96 }, /* GL_BLUE_INTEGER */
-   {  1947, 0x00008D96 }, /* GL_BLUE_INTEGER_EXT */
-   {  1967, 0x00000D1A }, /* GL_BLUE_SCALE */
-   {  1981, 0x00008B56 }, /* GL_BOOL */
-   {  1989, 0x00008B56 }, /* GL_BOOL_ARB */
-   {  2001, 0x00008B57 }, /* GL_BOOL_VEC2 */
-   {  2014, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
-   {  2031, 0x00008B58 }, /* GL_BOOL_VEC3 */
-   {  2044, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
-   {  2061, 0x00008B59 }, /* GL_BOOL_VEC4 */
-   {  2074, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
-   {  2091, 0x000088BB }, /* GL_BUFFER_ACCESS */
-   {  2108, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  2129, 0x0000911F }, /* GL_BUFFER_ACCESS_FLAGS */
-   {  2152, 0x000088BB }, /* GL_BUFFER_ACCESS_OES */
-   {  2173, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-   {  2204, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  2221, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  2242, 0x000088BC }, /* GL_BUFFER_MAPPED_OES */
-   {  2263, 0x00009120 }, /* GL_BUFFER_MAP_LENGTH */
-   {  2284, 0x00009121 }, /* GL_BUFFER_MAP_OFFSET */
-   {  2305, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  2327, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  2353, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_OES */
-   {  2379, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */
-   {  2402, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-   {  2436, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  2451, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  2470, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  2486, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  2506, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  2525, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  2551, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  2574, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  2602, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  2621, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  2643, 0x00001400 }, /* GL_BYTE */
-   {  2651, 0x00002A24 }, /* GL_C3F_V3F */
-   {  2662, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  2677, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2689, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2701, 0x00000901 }, /* GL_CCW */
-   {  2708, 0x00002900 }, /* GL_CLAMP */
-   {  2717, 0x0000891B }, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
-   {  2745, 0x0000891C }, /* GL_CLAMP_READ_COLOR */
-   {  2765, 0x0000891C }, /* GL_CLAMP_READ_COLOR_ARB */
-   {  2789, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2808, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2831, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2855, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2872, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2894, 0x0000891A }, /* GL_CLAMP_VERTEX_COLOR_ARB */
-   {  2920, 0x00001500 }, /* GL_CLEAR */
-   {  2929, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2954, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2983, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  3009, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  3038, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  3064, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  3091, 0x00003000 }, /* GL_CLIP_DISTANCE0 */
-   {  3109, 0x00003001 }, /* GL_CLIP_DISTANCE1 */
-   {  3127, 0x00003002 }, /* GL_CLIP_DISTANCE2 */
-   {  3145, 0x00003003 }, /* GL_CLIP_DISTANCE3 */
-   {  3163, 0x00003004 }, /* GL_CLIP_DISTANCE4 */
-   {  3181, 0x00003005 }, /* GL_CLIP_DISTANCE5 */
-   {  3199, 0x00003006 }, /* GL_CLIP_DISTANCE6 */
-   {  3217, 0x00003007 }, /* GL_CLIP_DISTANCE7 */
-   {  3235, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  3250, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  3265, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  3280, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  3295, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  3310, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  3325, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  3358, 0x00000A00 }, /* GL_COEFF */
-   {  3367, 0x00001800 }, /* GL_COLOR */
-   {  3376, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  3391, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  3421, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  3455, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  3478, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  3498, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  3520, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  3540, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  3561, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  3586, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_OES */
-   {  3611, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  3632, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  3654, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  3680, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  3702, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  3728, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  3750, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  3776, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  3798, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  3824, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  3846, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  3872, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  3894, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  3920, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  3945, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3966, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3991, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  4012, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  4037, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  4058, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  4083, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  4104, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  4129, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  4150, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  4175, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  4196, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  4221, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  4242, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  4267, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  4288, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  4313, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  4333, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  4354, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  4369, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  4386, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  4404, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  4422, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  4445, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  4473, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  4489, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  4509, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  4537, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  4569, 0x00008458 }, /* GL_COLOR_SUM */
-   {  4582, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  4599, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  4614, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  4640, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  4670, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  4700, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  4720, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  4744, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  4769, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  4798, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  4827, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  4849, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  4875, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  4901, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  4927, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4957, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4987, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  5017, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  5051, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  5085, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  5115, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  5149, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  5183, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  5207, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  5235, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  5263, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  5284, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  5309, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  5330, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  5355, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  5380, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  5399, 0x00008570 }, /* GL_COMBINE */
-   {  5410, 0x00008503 }, /* GL_COMBINE4 */
-   {  5422, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  5439, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  5460, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  5481, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  5496, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  5511, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  5526, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  5545, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  5564, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  5600, 0x0000884E }, /* GL_COMPARE_REF_TO_TEXTURE */
-   {  5626, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  5650, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  5678, 0x00001300 }, /* GL_COMPILE */
-   {  5689, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  5712, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  5730, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  5750, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  5774, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  5798, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  5826, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  5850, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  5880, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  5914, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  5942, 0x00008225 }, /* GL_COMPRESSED_RED */
-   {  5960, 0x00008226 }, /* GL_COMPRESSED_RG */
-   {  5977, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  5995, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  6014, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  6037, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  6066, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  6099, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  6132, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  6165, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  6187, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  6215, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  6247, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
-   {  6272, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-   {  6303, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
-   {  6322, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
-   {  6347, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  6377, 0x0000911C }, /* GL_CONDITION_SATISFIED */
-   {  6400, 0x00008576 }, /* GL_CONSTANT */
-   {  6412, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  6430, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  6452, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  6468, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  6492, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  6514, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  6532, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  6554, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  6570, 0x00000002 }, /* GL_CONTEXT_COMPATIBILITY_PROFILE_BIT */
-   {  6607, 0x00000001 }, /* GL_CONTEXT_CORE_PROFILE_BIT */
-   {  6635, 0x0000821E }, /* GL_CONTEXT_FLAGS */
-   {  6652, 0x00000001 }, /* GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT */
-   {  6691, 0x00000004 }, /* GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB */
-   {  6729, 0x00009126 }, /* GL_CONTEXT_PROFILE_MASK */
-   {  6753, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  6771, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  6789, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  6817, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  6848, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  6875, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  6906, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  6933, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  6964, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  6992, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  7024, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  7046, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  7072, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  7094, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  7120, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  7141, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  7166, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  7183, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  7204, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  7224, 0x00008862 }, /* GL_COORD_REPLACE_OES */
-   {  7245, 0x00001503 }, /* GL_COPY */
-   {  7253, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  7270, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  7290, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
-   {  7310, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
-   {  7331, 0x00000B44 }, /* GL_CULL_FACE */
-   {  7344, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  7362, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  7381, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  7413, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  7448, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  7469, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  7484, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  7501, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  7522, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  7548, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  7565, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  7587, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  7615, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  7636, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  7670, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  7703, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  7721, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  7751, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_OES */
-   {  7781, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  7800, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  7817, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  7838, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  7862, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  7889, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  7913, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  7940, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  7973, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  8007, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  8040, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  8067, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  8093, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  8118, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  8147, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  8169, 0x00000900 }, /* GL_CW */
-   {  8175, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  8196, 0x00008244 }, /* GL_DEBUG_CALLBACK_FUNCTION_ARB */
-   {  8227, 0x00008245 }, /* GL_DEBUG_CALLBACK_USER_PARAM_ARB */
-   {  8260, 0x00009145 }, /* GL_DEBUG_LOGGED_MESSAGES_ARB */
-   {  8289, 0x00008243 }, /* GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB */
-   {  8329, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  8350, 0x00008242 }, /* GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB */
-   {  8382, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  8402, 0x00009146 }, /* GL_DEBUG_SEVERITY_HIGH_ARB */
-   {  8429, 0x00009148 }, /* GL_DEBUG_SEVERITY_LOW_ARB */
-   {  8455, 0x00009147 }, /* GL_DEBUG_SEVERITY_MEDIUM_ARB */
-   {  8484, 0x00008246 }, /* GL_DEBUG_SOURCE_API_ARB */
-   {  8508, 0x0000824A }, /* GL_DEBUG_SOURCE_APPLICATION_ARB */
-   {  8540, 0x0000824B }, /* GL_DEBUG_SOURCE_OTHER_ARB */
-   {  8566, 0x00008248 }, /* GL_DEBUG_SOURCE_SHADER_COMPILER_ARB */
-   {  8602, 0x00008249 }, /* GL_DEBUG_SOURCE_THIRD_PARTY_ARB */
-   {  8634, 0x00008247 }, /* GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB */
-   {  8668, 0x0000824D }, /* GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB */
-   {  8706, 0x0000824C }, /* GL_DEBUG_TYPE_ERROR_ARB */
-   {  8730, 0x00008251 }, /* GL_DEBUG_TYPE_OTHER_ARB */
-   {  8754, 0x00008250 }, /* GL_DEBUG_TYPE_PERFORMANCE_ARB */
-   {  8784, 0x0000824F }, /* GL_DEBUG_TYPE_PORTABILITY_ARB */
-   {  8814, 0x0000824E }, /* GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB */
-   {  8851, 0x00002101 }, /* GL_DECAL */
-   {  8860, 0x00001E03 }, /* GL_DECR */
-   {  8868, 0x00008508 }, /* GL_DECR_WRAP */
-   {  8881, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  8898, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  8915, 0x00001801 }, /* GL_DEPTH */
-   {  8924, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  8944, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
-   {  8968, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */
-   {  8992, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  9012, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  9036, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */
-   {  9060, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  9074, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  9088, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  9108, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  9133, 0x00008223 }, /* GL_DEPTH_BUFFER */
-   {  9149, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  9169, 0x0000864F }, /* GL_DEPTH_CLAMP */
-   {  9184, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  9202, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  9223, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  9242, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  9263, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  9288, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */
-   {  9313, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  9339, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  9360, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  9385, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */
-   {  9410, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  9436, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  9457, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  9482, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */
-   {  9507, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  9533, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  9547, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  9562, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  9577, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  9594, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  9622, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
-   {  9643, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  9663, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */
-   {  9684, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  9712, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  9740, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  9754, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  9776, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  9802, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  9821, 0x00001201 }, /* GL_DIFFUSE */
-   {  9832, 0x00000BD0 }, /* GL_DITHER */
-   {  9842, 0x00000A02 }, /* GL_DOMAIN */
-   {  9852, 0x00001100 }, /* GL_DONT_CARE */
-   {  9865, 0x000086AE }, /* GL_DOT3_RGB */
-   {  9877, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  9890, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  9907, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  9924, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  9940, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  9956, 0x0000140A }, /* GL_DOUBLE */
-   {  9966, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  9982, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  9997, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   { 10013, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   { 10033, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   { 10053, 0x00008825 }, /* GL_DRAW_BUFFER0_NV */
-   { 10072, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   { 10088, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   { 10105, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   { 10126, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   { 10147, 0x0000882F }, /* GL_DRAW_BUFFER10_NV */
-   { 10167, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   { 10184, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   { 10205, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   { 10226, 0x00008830 }, /* GL_DRAW_BUFFER11_NV */
-   { 10246, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   { 10263, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   { 10284, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   { 10305, 0x00008831 }, /* GL_DRAW_BUFFER12_NV */
-   { 10325, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   { 10342, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   { 10363, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   { 10384, 0x00008832 }, /* GL_DRAW_BUFFER13_NV */
-   { 10404, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   { 10421, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   { 10442, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   { 10463, 0x00008833 }, /* GL_DRAW_BUFFER14_NV */
-   { 10483, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   { 10500, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   { 10521, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   { 10542, 0x00008834 }, /* GL_DRAW_BUFFER15_NV */
-   { 10562, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   { 10582, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   { 10602, 0x00008826 }, /* GL_DRAW_BUFFER1_NV */
-   { 10621, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   { 10637, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   { 10657, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   { 10677, 0x00008827 }, /* GL_DRAW_BUFFER2_NV */
-   { 10696, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   { 10712, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   { 10732, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   { 10752, 0x00008828 }, /* GL_DRAW_BUFFER3_NV */
-   { 10771, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   { 10787, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   { 10807, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   { 10827, 0x00008829 }, /* GL_DRAW_BUFFER4_NV */
-   { 10846, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   { 10862, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   { 10882, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   { 10902, 0x0000882A }, /* GL_DRAW_BUFFER5_NV */
-   { 10921, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   { 10937, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   { 10957, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   { 10977, 0x0000882B }, /* GL_DRAW_BUFFER6_NV */
-   { 10996, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   { 11012, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   { 11032, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   { 11052, 0x0000882C }, /* GL_DRAW_BUFFER7_NV */
-   { 11071, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   { 11087, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   { 11107, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   { 11127, 0x0000882D }, /* GL_DRAW_BUFFER8_NV */
-   { 11146, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   { 11162, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   { 11182, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   { 11202, 0x0000882E }, /* GL_DRAW_BUFFER9_NV */
-   { 11221, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   { 11241, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
-   { 11269, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   { 11301, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   { 11325, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   { 11345, 0x00000304 }, /* GL_DST_ALPHA */
-   { 11358, 0x00000306 }, /* GL_DST_COLOR */
-   { 11371, 0x0000877A }, /* GL_DU8DV8_ATI */
-   { 11385, 0x00008779 }, /* GL_DUDV_ATI */
-   { 11397, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   { 11413, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   { 11433, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   { 11449, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   { 11469, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   { 11485, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   { 11505, 0x00000B43 }, /* GL_EDGE_FLAG */
-   { 11518, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   { 11537, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   { 11571, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   { 11609, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   { 11636, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   { 11662, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   { 11686, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   { 11718, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   { 11754, 0x00001600 }, /* GL_EMISSION */
-   { 11766, 0x00002000 }, /* GL_ENABLE_BIT */
-   { 11780, 0x00000202 }, /* GL_EQUAL */
-   { 11789, 0x00001509 }, /* GL_EQUIV */
-   { 11798, 0x00008D64 }, /* GL_ETC1_RGB8_OES */
-   { 11815, 0x00010000 }, /* GL_EVAL_BIT */
-   { 11827, 0x00000800 }, /* GL_EXP */
-   { 11834, 0x00000801 }, /* GL_EXP2 */
-   { 11842, 0x00001F03 }, /* GL_EXTENSIONS */
-   { 11856, 0x00002400 }, /* GL_EYE_LINEAR */
-   { 11870, 0x00002502 }, /* GL_EYE_PLANE */
-   { 11883, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   { 11908, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   { 11925, 0x00000000 }, /* GL_FALSE */
-   { 11934, 0x00001101 }, /* GL_FASTEST */
-   { 11945, 0x00001C01 }, /* GL_FEEDBACK */
-   { 11957, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   { 11984, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   { 12008, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   { 12032, 0x00001B02 }, /* GL_FILL */
-   { 12040, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
-   { 12067, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   { 12098, 0x0000140C }, /* GL_FIXED */
-   { 12107, 0x0000140C }, /* GL_FIXED_OES */
-   { 12120, 0x0000891D }, /* GL_FIXED_ONLY */
-   { 12134, 0x0000891D }, /* GL_FIXED_ONLY_ARB */
-   { 12152, 0x00001D00 }, /* GL_FLAT */
-   { 12160, 0x00001406 }, /* GL_FLOAT */
-   { 12169, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   { 12183, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   { 12201, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   { 12217, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   { 12233, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   { 12247, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   { 12265, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   { 12281, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   { 12297, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   { 12311, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   { 12329, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   { 12345, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   { 12361, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   { 12375, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   { 12393, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   { 12407, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 12425, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 12439, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 12457, 0x00000B60 }, /* GL_FOG */
-   { 12464, 0x00000080 }, /* GL_FOG_BIT */
-   { 12475, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 12488, 0x00008451 }, /* GL_FOG_COORD */
-   { 12501, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 12519, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 12543, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 12582, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 12625, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 12657, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 12688, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 12717, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 12742, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 12761, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 12795, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 12822, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 12848, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 12872, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 12889, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 12904, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 12928, 0x00000B64 }, /* GL_FOG_END */
-   { 12939, 0x00000C54 }, /* GL_FOG_HINT */
-   { 12951, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 12964, 0x00000B65 }, /* GL_FOG_MODE */
-   { 12976, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 12995, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 13020, 0x00000B63 }, /* GL_FOG_START */
-   { 13033, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 13051, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 13075, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 13094, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 13117, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 13152, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
-   { 13191, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 13206, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 13243, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 13279, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 13320, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 13361, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 13398, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 13435, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
-   { 13469, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
-   { 13507, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 13545, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 13587, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
-   { 13629, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 13667, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 13709, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
-   { 13751, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 13786, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 13825, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 13874, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
-   { 13923, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 13971, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 14023, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
-   { 14075, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 14115, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 14159, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 14199, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 14243, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
-   { 14287, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
-   { 14310, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 14337, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
-   { 14364, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 14388, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 14416, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
-   { 14444, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 14467, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 14486, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 14523, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 14564, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
-   { 14605, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
-   { 14642, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 14683, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
-   { 14724, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-   { 14762, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 14804, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
-   { 14846, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 14897, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 14935, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
-   { 14973, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-   { 15015, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
-   { 15055, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
-   { 15099, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 15144, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 15193, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
-   { 15242, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 15280, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
-   { 15322, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-   { 15360, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 15402, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
-   { 15444, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
-   { 15463, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 15495, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 15520, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 15547, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 15578, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
-   { 15609, 0x00000404 }, /* GL_FRONT */
-   { 15618, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 15636, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 15650, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 15664, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 15679, 0x00008006 }, /* GL_FUNC_ADD */
-   { 15691, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 15707, 0x00008006 }, /* GL_FUNC_ADD_OES */
-   { 15723, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 15748, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 15777, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
-   { 15806, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 15823, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 15844, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
-   { 15865, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 15884, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 15908, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 15937, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 15961, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */
-   { 15984, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-   { 16011, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */
-   { 16035, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-   { 16063, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */
-   { 16082, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
-   { 16105, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */
-   { 16130, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-   { 16159, 0x00000206 }, /* GL_GEQUAL */
-   { 16169, 0x0000912F }, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
-   { 16200, 0x00000204 }, /* GL_GREATER */
-   { 16211, 0x00001904 }, /* GL_GREEN */
-   { 16220, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 16234, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 16248, 0x00008D95 }, /* GL_GREEN_INTEGER */
-   { 16265, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */
-   { 16286, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 16301, 0x00008253 }, /* GL_GUILTY_CONTEXT_RESET_ARB */
-   { 16329, 0x0000140B }, /* GL_HALF_FLOAT */
-   { 16343, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
-   { 16361, 0x00008DF2 }, /* GL_HIGH_FLOAT */
-   { 16375, 0x00008DF5 }, /* GL_HIGH_INT */
-   { 16387, 0x00008000 }, /* GL_HINT_BIT */
-   { 16399, 0x00008024 }, /* GL_HISTOGRAM */
-   { 16412, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 16436, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 16464, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 16487, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 16514, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 16531, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 16551, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 16575, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 16599, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 16627, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 16655, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 16687, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 16709, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 16735, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 16753, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 16775, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 16794, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 16817, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 16832, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 16852, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-   { 16888, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 16928, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-   { 16962, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 17000, 0x00001E02 }, /* GL_INCR */
-   { 17008, 0x00008507 }, /* GL_INCR_WRAP */
-   { 17021, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 17038, 0x00008222 }, /* GL_INDEX */
-   { 17047, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 17062, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 17092, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 17126, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 17149, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 17171, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 17191, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 17205, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 17226, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 17244, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 17258, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 17274, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 17289, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 17308, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 17327, 0x00008254 }, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-   { 17357, 0x00001404 }, /* GL_INT */
-   { 17364, 0x00008049 }, /* GL_INTENSITY */
-   { 17377, 0x0000804C }, /* GL_INTENSITY12 */
-   { 17392, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 17411, 0x0000804D }, /* GL_INTENSITY16 */
-   { 17426, 0x00008D8B }, /* GL_INTENSITY16I_EXT */
-   { 17446, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */
-   { 17467, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 17486, 0x00008D85 }, /* GL_INTENSITY32I_EXT */
-   { 17506, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */
-   { 17527, 0x0000804A }, /* GL_INTENSITY4 */
-   { 17541, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 17559, 0x0000804B }, /* GL_INTENSITY8 */
-   { 17573, 0x00008D91 }, /* GL_INTENSITY8I_EXT */
-   { 17592, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */
-   { 17612, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 17630, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 17647, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */
-   { 17670, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
-   { 17697, 0x00008575 }, /* GL_INTERPOLATE */
-   { 17712, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 17731, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 17750, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
-   { 17772, 0x00008D9F }, /* GL_INT_2_10_10_10_REV */
-   { 17794, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */
-   { 17812, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */
-   { 17836, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */
-   { 17864, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */
-   { 17886, 0x00008DCA }, /* GL_INT_SAMPLER_2D */
-   { 17904, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */
-   { 17928, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */
-   { 17956, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */
-   { 17978, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */
-   { 18001, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */
-   { 18028, 0x00008DCB }, /* GL_INT_SAMPLER_3D */
-   { 18046, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */
-   { 18068, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */
-   { 18090, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */
-   { 18116, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */
-   { 18136, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */
-   { 18160, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 18172, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 18188, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 18200, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 18216, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 18228, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 18244, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 18260, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 18293, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 18330, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
-   { 18367, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 18388, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 18405, 0x0000862B }, /* GL_INVERSE_NV */
-   { 18419, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 18443, 0x0000150A }, /* GL_INVERT */
-   { 18453, 0x00001E00 }, /* GL_KEEP */
-   { 18461, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
-   { 18487, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 18517, 0x00000406 }, /* GL_LEFT */
-   { 18525, 0x00000203 }, /* GL_LEQUAL */
-   { 18535, 0x00000201 }, /* GL_LESS */
-   { 18543, 0x00004000 }, /* GL_LIGHT0 */
-   { 18553, 0x00004001 }, /* GL_LIGHT1 */
-   { 18563, 0x00004002 }, /* GL_LIGHT2 */
-   { 18573, 0x00004003 }, /* GL_LIGHT3 */
-   { 18583, 0x00004004 }, /* GL_LIGHT4 */
-   { 18593, 0x00004005 }, /* GL_LIGHT5 */
-   { 18603, 0x00004006 }, /* GL_LIGHT6 */
-   { 18613, 0x00004007 }, /* GL_LIGHT7 */
-   { 18623, 0x00000B50 }, /* GL_LIGHTING */
-   { 18635, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 18651, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 18674, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 18703, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 18736, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 18764, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 18788, 0x00001B01 }, /* GL_LINE */
-   { 18796, 0x00002601 }, /* GL_LINEAR */
-   { 18806, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 18828, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 18858, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 18889, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 18913, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 18938, 0x00000001 }, /* GL_LINES */
-   { 18947, 0x0000000A }, /* GL_LINES_ADJACENCY */
-   { 18966, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
-   { 18989, 0x00000004 }, /* GL_LINE_BIT */
-   { 19001, 0x00000002 }, /* GL_LINE_LOOP */
-   { 19014, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 19034, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 19049, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 19069, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 19085, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 19109, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 19132, 0x00000003 }, /* GL_LINE_STRIP */
-   { 19146, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */
-   { 19170, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
-   { 19198, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 19212, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 19226, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 19252, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 19272, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 19287, 0x00000B32 }, /* GL_LIST_BASE */
-   { 19300, 0x00020000 }, /* GL_LIST_BIT */
-   { 19312, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 19326, 0x00000B30 }, /* GL_LIST_MODE */
-   { 19339, 0x00000101 }, /* GL_LOAD */
-   { 19347, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 19359, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 19376, 0x00008252 }, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
-   { 19405, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 19419, 0x00008DF0 }, /* GL_LOW_FLOAT */
-   { 19432, 0x00008DF3 }, /* GL_LOW_INT */
-   { 19443, 0x00001909 }, /* GL_LUMINANCE */
-   { 19456, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 19471, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 19494, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 19521, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 19543, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 19569, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 19588, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 19603, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */
-   { 19623, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */
-   { 19644, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 19667, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 19694, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 19713, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */
-   { 19733, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */
-   { 19754, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 19768, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 19789, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 19814, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 19832, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 19853, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 19878, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 19892, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */
-   { 19911, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */
-   { 19931, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 19952, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 19977, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 19995, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 20014, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */
-   { 20040, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */
-   { 20067, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */
-   { 20093, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */
-   { 20120, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */
-   { 20145, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */
-   { 20171, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-   { 20202, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */
-   { 20227, 0x0000821B }, /* GL_MAJOR_VERSION */
-   { 20244, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 20260, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 20280, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 20302, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 20316, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 20331, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 20355, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 20379, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 20403, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 20427, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 20444, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 20461, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 20489, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 20518, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 20547, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 20576, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 20605, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 20634, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 20663, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 20691, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 20719, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 20747, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 20775, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 20803, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 20831, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 20859, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 20887, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 20915, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 20931, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 20951, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 20973, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 20987, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 21002, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 21026, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 21050, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 21074, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 21098, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 21115, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 21132, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 21160, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 21189, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 21218, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 21247, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 21276, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 21305, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 21334, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 21362, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 21390, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 21418, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 21446, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 21474, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 21502, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 21530, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 21558, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 21586, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 21599, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 21625, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 21654, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 21682, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 21698, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 21713, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 21739, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 21756, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 21771, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 21785, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 21801, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 21817, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 21833, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 21849, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 21865, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 21881, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 21897, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 21913, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 21929, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 21945, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 21960, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 21974, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 21990, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 22006, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 22022, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 22038, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 22054, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 22070, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 22086, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 22102, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 22118, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 22134, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 22149, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 22163, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 22179, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 22195, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 22210, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 22224, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 22239, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 22253, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 22268, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 22282, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 22297, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 22311, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 22326, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 22340, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 22355, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 22370, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 22396, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-   { 22437, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
-   { 22463, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 22497, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
-   { 22531, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 22562, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
-   { 22593, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 22626, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
-   { 22659, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 22690, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
-   { 22721, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 22736, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 22758, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
-   { 22780, 0x00008008 }, /* GL_MAX */
-   { 22787, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 22810, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
-   { 22837, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-   { 22865, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 22897, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 22923, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 22956, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 22982, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 23016, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */
-   { 23038, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 23057, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
-   { 23082, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 23111, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 23143, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 23179, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 23215, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 23255, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 23281, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 23311, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 23336, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 23365, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 23394, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 23427, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
-   { 23460, 0x00009144 }, /* GL_MAX_DEBUG_LOGGED_MESSAGES_ARB */
-   { 23493, 0x00009143 }, /* GL_MAX_DEBUG_MESSAGE_LENGTH_ARB */
-   { 23525, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 23545, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 23569, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 23593, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_NV */
-   { 23616, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 23640, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 23665, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 23683, 0x00008008 }, /* GL_MAX_EXT */
-   { 23694, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
-   { 23727, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 23762, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 23801, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-   { 23833, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
-   { 23866, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
-   { 23900, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
-   { 23932, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
-   { 23968, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-   { 24004, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
-   { 24044, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
-   { 24084, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
-   { 24128, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
-   { 24163, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
-   { 24202, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-   { 24241, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 24255, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 24275, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 24313, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 24342, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 24366, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 24394, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
-   { 24422, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 24445, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 24482, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 24518, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 24545, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 24574, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 24608, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 24644, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 24671, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 24703, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 24739, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 24768, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 24797, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 24825, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 24863, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 24907, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 24950, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 24984, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 25023, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 25060, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 25098, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 25141, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 25184, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 25214, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 25245, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-   { 25273, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 25309, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 25345, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 25375, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
-   { 25405, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 25439, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 25472, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 25497, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 25526, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
-   { 25555, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 25570, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 25589, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 25616, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 25636, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 25660, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-   { 25687, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
-   { 25718, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 25740, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 25766, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 25793, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25824, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 25848, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
-   { 25876, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 25910, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 25930, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 25957, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 25978, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 26003, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 26028, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 26063, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-   { 26112, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-   { 26165, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-   { 26208, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-   { 26255, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-   { 26301, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-   { 26351, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
-   { 26377, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 26399, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 26425, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
-   { 26448, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 26470, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 26496, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-   { 26528, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 26562, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 26600, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 26633, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 26670, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-   { 26700, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 26724, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
-   { 26748, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-   { 26785, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 26806, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
-   { 26822, 0x00008DF4 }, /* GL_MEDIUM_INT */
-   { 26836, 0x00008007 }, /* GL_MIN */
-   { 26843, 0x0000802E }, /* GL_MINMAX */
-   { 26853, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 26867, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 26884, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 26905, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 26920, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 26939, 0x0000821C }, /* GL_MINOR_VERSION */
-   { 26956, 0x00008007 }, /* GL_MIN_EXT */
-   { 26967, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-   { 26995, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 27014, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 27037, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 27060, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 27080, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 27100, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 27130, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 27158, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 27186, 0x00001700 }, /* GL_MODELVIEW */
-   { 27199, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 27217, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 27236, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 27255, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 27274, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 27293, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 27312, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 27331, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 27350, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 27369, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 27388, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 27407, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 27425, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 27444, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 27463, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 27482, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 27501, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 27520, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 27539, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 27558, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 27577, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 27596, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 27615, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 27633, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 27652, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 27671, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 27689, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 27707, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 27725, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 27743, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 27761, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 27779, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 27797, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 27817, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 27859, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 27886, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 27911, 0x00002100 }, /* GL_MODULATE */
-   { 27923, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 27943, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 27970, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 27995, 0x00000103 }, /* GL_MULT */
-   { 28003, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 28018, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 28038, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 28057, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 28076, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 28100, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 28123, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 28153, 0x00002A25 }, /* GL_N3F_V3F */
-   { 28164, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 28184, 0x0000150E }, /* GL_NAND */
-   { 28192, 0x00002600 }, /* GL_NEAREST */
-   { 28203, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 28234, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 28266, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 28291, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 28317, 0x00000200 }, /* GL_NEVER */
-   { 28326, 0x00001102 }, /* GL_NICEST */
-   { 28336, 0x00000000 }, /* GL_NONE */
-   { 28344, 0x00000000 }, /* GL_NONE_OES */
-   { 28356, 0x00001505 }, /* GL_NOOP */
-   { 28364, 0x00001508 }, /* GL_NOR */
-   { 28371, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 28384, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 28400, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 28431, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 28466, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 28490, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 28513, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 28534, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 28548, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 28566, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 28583, 0x00008511 }, /* GL_NORMAL_MAP_OES */
-   { 28601, 0x00000205 }, /* GL_NOTEQUAL */
-   { 28613, 0x00000000 }, /* GL_NO_ERROR */
-   { 28625, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
-   { 28654, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 28688, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 28726, 0x0000821D }, /* GL_NUM_EXTENSIONS */
-   { 28744, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-   { 28774, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 28808, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 28837, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 28869, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 28911, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 28941, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 28981, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 29012, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 29041, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 29069, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 29099, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 29116, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 29142, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 29158, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 29193, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 29215, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 29230, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 29249, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 29279, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 29300, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 29328, 0x00000001 }, /* GL_ONE */
-   { 29335, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 29363, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 29395, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 29423, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 29455, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 29478, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 29501, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 29524, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 29547, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 29565, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 29587, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 29609, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 29625, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 29645, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 29665, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 29683, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 29705, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 29727, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 29743, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 29763, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 29783, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 29801, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 29823, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 29845, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 29861, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 29881, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 29901, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 29922, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 29941, 0x00001507 }, /* GL_OR */
-   { 29947, 0x00000A01 }, /* GL_ORDER */
-   { 29956, 0x0000150D }, /* GL_OR_INVERTED */
-   { 29971, 0x0000150B }, /* GL_OR_REVERSE */
-   { 29985, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 30002, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 30020, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 30041, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 30061, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 30079, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 30098, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 30118, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 30138, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 30156, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 30175, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 30200, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 30224, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 30245, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 30267, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 30289, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 30314, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 30338, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 30359, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 30381, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 30403, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 30425, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 30456, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 30476, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 30501, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 30521, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 30546, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 30566, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 30591, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 30611, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 30636, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 30656, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 30681, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 30701, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 30726, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 30746, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 30771, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 30791, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 30816, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 30836, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 30861, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 30881, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 30906, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 30924, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 30945, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 30974, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 31007, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 31032, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 31055, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 31086, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 31121, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 31148, 0x00001B00 }, /* GL_POINT */
-   { 31157, 0x00000000 }, /* GL_POINTS */
-   { 31167, 0x00000002 }, /* GL_POINT_BIT */
-   { 31180, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 31210, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 31244, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 31278, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 31313, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 31342, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 31375, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 31408, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 31442, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 31456, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 31495, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 31519, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 31551, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 31582, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 31611, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 31637, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 31655, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 31677, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 31699, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 31722, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 31740, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 31762, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 31784, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 31807, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 31827, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 31843, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 31864, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 31880, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 31900, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 31929, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 31948, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 31968, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 31994, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 32009, 0x00000009 }, /* GL_POLYGON */
-   { 32020, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 32035, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 32051, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 32074, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 32099, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 32122, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 32145, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 32169, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 32193, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 32211, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 32234, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 32253, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 32276, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 32293, 0x00001203 }, /* GL_POSITION */
-   { 32305, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 32337, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 32373, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 32406, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 32443, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 32474, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 32509, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 32541, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 32577, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 32610, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 32642, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 32678, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 32711, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 32748, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 32778, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 32812, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 32843, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 32878, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 32909, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 32944, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 32976, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 33012, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 33042, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 33076, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 33107, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 33142, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 33174, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 33205, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 33240, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 33272, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 33308, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 33337, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 33370, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 33400, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 33434, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 33473, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 33506, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 33546, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 33580, 0x00008578 }, /* GL_PREVIOUS */
-   { 33592, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 33608, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 33624, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 33641, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 33662, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 33683, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
-   { 33707, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 33735, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
-   { 33756, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
-   { 33783, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-   { 33813, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
-   { 33837, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 33870, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 33902, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 33925, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
-   { 33951, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 33981, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
-   { 34006, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 34035, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-   { 34070, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 34093, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 34123, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 34152, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 34180, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 34202, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 34230, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 34258, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 34280, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 34301, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 34341, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 34380, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 34410, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 34445, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 34478, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 34512, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 34551, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 34590, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 34612, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 34638, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 34662, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
-   { 34684, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 34710, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 34733, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 34755, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 34776, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 34797, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 34824, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 34856, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 34888, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 34923, 0x00001701 }, /* GL_PROJECTION */
-   { 34937, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 34958, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 35001, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 35027, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 35047, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 35071, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 35092, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 35111, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 35134, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 35173, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 35211, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 35231, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
-   { 35257, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 35287, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 35311, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 35331, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
-   { 35357, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 35387, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 35411, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 35431, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 35464, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 35490, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 35520, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
-   { 35547, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 35578, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 35608, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 35627, 0x00002003 }, /* GL_Q */
-   { 35632, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 35657, 0x00000007 }, /* GL_QUADS */
-   { 35666, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 35710, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 35758, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 35775, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 35789, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
-   { 35816, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 35846, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
-   { 35870, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 35897, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 35919, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 35945, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
-   { 35962, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 35982, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 35998, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 36018, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 36044, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 36074, 0x00008E13 }, /* GL_QUERY_WAIT */
-   { 36088, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 36105, 0x00002002 }, /* GL_R */
-   { 36110, 0x00008C3A }, /* GL_R11F_G11F_B10F */
-   { 36128, 0x00008F98 }, /* GL_R16_SNORM */
-   { 36141, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 36153, 0x00008F94 }, /* GL_R8_SNORM */
-   { 36165, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
-   { 36187, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 36213, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 36246, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 36261, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 36281, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 36309, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 36341, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 36365, 0x000088B8 }, /* GL_READ_ONLY */
-   { 36378, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 36395, 0x000088BA }, /* GL_READ_WRITE */
-   { 36409, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 36427, 0x00001903 }, /* GL_RED */
-   { 36434, 0x00008016 }, /* GL_REDUCE */
-   { 36444, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 36458, 0x00000D15 }, /* GL_RED_BIAS */
-   { 36470, 0x00000D52 }, /* GL_RED_BITS */
-   { 36482, 0x00008D94 }, /* GL_RED_INTEGER */
-   { 36497, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
-   { 36516, 0x00000D14 }, /* GL_RED_SCALE */
-   { 36529, 0x00008F90 }, /* GL_RED_SNORM */
-   { 36542, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 36560, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 36582, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 36603, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 36625, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 36643, 0x00001C00 }, /* GL_RENDER */
-   { 36653, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 36669, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 36696, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 36727, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 36751, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 36779, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 36807, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 36833, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 36863, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 36890, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 36921, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 36941, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 36968, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 36999, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 37022, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 37049, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 37076, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 37108, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 37144, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 37180, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 37200, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 37225, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 37254, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 37278, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 37306, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 37335, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 37368, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 37390, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 37416, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 37442, 0x00001F01 }, /* GL_RENDERER */
-   { 37454, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 37469, 0x00002901 }, /* GL_REPEAT */
-   { 37479, 0x00001E01 }, /* GL_REPLACE */
-   { 37490, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 37505, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 37528, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-   { 37564, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 37582, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 37604, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-   { 37639, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 37657, 0x00000102 }, /* GL_RETURN */
-   { 37667, 0x00008F99 }, /* GL_RG16_SNORM */
-   { 37681, 0x00008F95 }, /* GL_RG8_SNORM */
-   { 37694, 0x00001907 }, /* GL_RGB */
-   { 37701, 0x00008052 }, /* GL_RGB10 */
-   { 37710, 0x00008059 }, /* GL_RGB10_A2 */
-   { 37722, 0x0000906F }, /* GL_RGB10_A2UI */
-   { 37736, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 37752, 0x00008052 }, /* GL_RGB10_EXT */
-   { 37765, 0x00008053 }, /* GL_RGB12 */
-   { 37774, 0x00008053 }, /* GL_RGB12_EXT */
-   { 37787, 0x00008054 }, /* GL_RGB16 */
-   { 37796, 0x0000881B }, /* GL_RGB16F */
-   { 37806, 0x00008D89 }, /* GL_RGB16I */
-   { 37816, 0x00008D89 }, /* GL_RGB16I_EXT */
-   { 37830, 0x00008D77 }, /* GL_RGB16UI */
-   { 37841, 0x00008D77 }, /* GL_RGB16UI_EXT */
-   { 37856, 0x00008054 }, /* GL_RGB16_EXT */
-   { 37869, 0x00008F9A }, /* GL_RGB16_SNORM */
-   { 37884, 0x0000804E }, /* GL_RGB2_EXT */
-   { 37896, 0x00008815 }, /* GL_RGB32F */
-   { 37906, 0x00008D83 }, /* GL_RGB32I */
-   { 37916, 0x00008D83 }, /* GL_RGB32I_EXT */
-   { 37930, 0x00008D71 }, /* GL_RGB32UI */
-   { 37941, 0x00008D71 }, /* GL_RGB32UI_EXT */
-   { 37956, 0x0000804F }, /* GL_RGB4 */
-   { 37964, 0x0000804F }, /* GL_RGB4_EXT */
-   { 37976, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 37989, 0x00008050 }, /* GL_RGB5 */
-   { 37997, 0x00008D62 }, /* GL_RGB565 */
-   { 38007, 0x00008D62 }, /* GL_RGB565_OES */
-   { 38021, 0x00008057 }, /* GL_RGB5_A1 */
-   { 38032, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 38047, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 38062, 0x00008050 }, /* GL_RGB5_EXT */
-   { 38074, 0x00008051 }, /* GL_RGB8 */
-   { 38082, 0x00008D8F }, /* GL_RGB8I */
-   { 38091, 0x00008D8F }, /* GL_RGB8I_EXT */
-   { 38104, 0x00008D7D }, /* GL_RGB8UI */
-   { 38114, 0x00008D7D }, /* GL_RGB8UI_EXT */
-   { 38128, 0x00008051 }, /* GL_RGB8_EXT */
-   { 38140, 0x00008051 }, /* GL_RGB8_OES */
-   { 38152, 0x00008F96 }, /* GL_RGB8_SNORM */
-   { 38166, 0x00008C3D }, /* GL_RGB9_E5 */
-   { 38177, 0x00001908 }, /* GL_RGBA */
-   { 38185, 0x0000805A }, /* GL_RGBA12 */
-   { 38195, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 38209, 0x0000805B }, /* GL_RGBA16 */
-   { 38219, 0x0000881A }, /* GL_RGBA16F */
-   { 38230, 0x00008D88 }, /* GL_RGBA16I */
-   { 38241, 0x00008D88 }, /* GL_RGBA16I_EXT */
-   { 38256, 0x00008D76 }, /* GL_RGBA16UI */
-   { 38268, 0x00008D76 }, /* GL_RGBA16UI_EXT */
-   { 38284, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 38298, 0x00008F9B }, /* GL_RGBA16_SNORM */
-   { 38314, 0x00008055 }, /* GL_RGBA2 */
-   { 38323, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 38336, 0x00008814 }, /* GL_RGBA32F */
-   { 38347, 0x00008D82 }, /* GL_RGBA32I */
-   { 38358, 0x00008D82 }, /* GL_RGBA32I_EXT */
-   { 38373, 0x00008D70 }, /* GL_RGBA32UI */
-   { 38385, 0x00008D70 }, /* GL_RGBA32UI_EXT */
-   { 38401, 0x00008056 }, /* GL_RGBA4 */
-   { 38410, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 38429, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 38442, 0x00008056 }, /* GL_RGBA4_OES */
-   { 38455, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 38469, 0x00008058 }, /* GL_RGBA8 */
-   { 38478, 0x00008D8E }, /* GL_RGBA8I */
-   { 38488, 0x00008D8E }, /* GL_RGBA8I_EXT */
-   { 38502, 0x00008D7C }, /* GL_RGBA8UI */
-   { 38513, 0x00008D7C }, /* GL_RGBA8UI_EXT */
-   { 38528, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 38541, 0x00008058 }, /* GL_RGBA8_OES */
-   { 38554, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 38569, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 38587, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
-   { 38610, 0x00008D99 }, /* GL_RGBA_INTEGER */
-   { 38626, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
-   { 38646, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
-   { 38671, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 38684, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 38697, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 38711, 0x00008D98 }, /* GL_RGB_INTEGER */
-   { 38726, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
-   { 38745, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 38757, 0x00008573 }, /* GL_RGB_SCALE */
-   { 38770, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 38787, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 38804, 0x00008F92 }, /* GL_RGB_SNORM */
-   { 38817, 0x00008F91 }, /* GL_RG_SNORM */
-   { 38829, 0x00000407 }, /* GL_RIGHT */
-   { 38838, 0x00002000 }, /* GL_S */
-   { 38843, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 38857, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
-   { 38877, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
-   { 38901, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-   { 38928, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
-   { 38959, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 38980, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 38994, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
-   { 39014, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
-   { 39038, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-   { 39065, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
-   { 39096, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
-   { 39115, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
-   { 39141, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 39162, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 39176, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 39194, 0x00008919 }, /* GL_SAMPLER_BINDING */
-   { 39213, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 39231, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 39253, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 39269, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 39292, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 39319, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
-   { 39343, 0x000080A9 }, /* GL_SAMPLES */
-   { 39354, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 39370, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 39385, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 39403, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 39425, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 39453, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 39485, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 39508, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 39535, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 39553, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 39576, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 39598, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 39617, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 39640, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 39666, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 39696, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 39721, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 39750, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 39765, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 39780, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 39796, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 39821, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 39861, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 39905, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 39938, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 39968, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 40000, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 40030, 0x00001C02 }, /* GL_SELECT */
-   { 40040, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 40068, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 40093, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 40109, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 40129, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 40153, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 40180, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 40211, 0x0000150F }, /* GL_SET */
-   { 40218, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 40243, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 40262, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 40283, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 40307, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 40322, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 40337, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 40365, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 40388, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 40418, 0x00001601 }, /* GL_SHININESS */
-   { 40431, 0x00001402 }, /* GL_SHORT */
-   { 40440, 0x00009119 }, /* GL_SIGNALED */
-   { 40452, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 40473, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 40489, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 40509, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 40528, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 40542, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 40557, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 40579, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 40599, 0x00001D01 }, /* GL_SMOOTH */
-   { 40609, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 40642, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 40669, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 40702, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 40729, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 40746, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 40767, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 40788, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 40803, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 40822, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 40841, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 40858, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 40879, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 40900, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 40915, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 40934, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 40953, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 40970, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 40991, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 41012, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 41027, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 41046, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 41065, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 41085, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 41103, 0x00001202 }, /* GL_SPECULAR */
-   { 41115, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 41129, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 41144, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 41162, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 41179, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 41193, 0x00008580 }, /* GL_SRC0_RGB */
-   { 41205, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 41219, 0x00008581 }, /* GL_SRC1_RGB */
-   { 41231, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 41245, 0x00008582 }, /* GL_SRC2_RGB */
-   { 41257, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 41270, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 41292, 0x00000300 }, /* GL_SRC_COLOR */
-   { 41305, 0x00008C40 }, /* GL_SRGB */
-   { 41313, 0x00008C41 }, /* GL_SRGB8 */
-   { 41322, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 41338, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 41352, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 41370, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 41389, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 41404, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 41423, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 41438, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 41457, 0x000088E5 }, /* GL_STATIC_READ */
-   { 41472, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 41491, 0x00001802 }, /* GL_STENCIL */
-   { 41502, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 41524, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 41550, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 41576, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 41597, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 41622, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 41643, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 41668, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 41700, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 41736, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 41768, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 41804, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 41824, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 41851, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 41877, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 41893, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 41911, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 41933, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 41956, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 41972, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 41988, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 42005, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 42023, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 42042, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 42065, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 42087, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 42109, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 42127, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 42149, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 42171, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 42189, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 42211, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 42233, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 42254, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 42281, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 42308, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 42323, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 42339, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 42368, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 42390, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 42411, 0x00000C33 }, /* GL_STEREO */
-   { 42421, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 42445, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 42470, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 42494, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 42509, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 42528, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 42543, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 42562, 0x000088E1 }, /* GL_STREAM_READ */
-   { 42577, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 42596, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 42613, 0x000084E7 }, /* GL_SUBTRACT */
-   { 42625, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 42641, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 42659, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 42673, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 42687, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 42714, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 42744, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 42759, 0x00002001 }, /* GL_T */
-   { 42764, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 42779, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 42798, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 42814, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 42829, 0x00002A27 }, /* GL_T2F_V3F */
-   { 42840, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 42859, 0x00002A28 }, /* GL_T4F_V4F */
-   { 42870, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 42893, 0x00001702 }, /* GL_TEXTURE */
-   { 42904, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 42916, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 42932, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 42944, 0x000084CA }, /* GL_TEXTURE10 */
-   { 42957, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 42974, 0x000084CB }, /* GL_TEXTURE11 */
-   { 42987, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 43004, 0x000084CC }, /* GL_TEXTURE12 */
-   { 43017, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 43034, 0x000084CD }, /* GL_TEXTURE13 */
-   { 43047, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 43064, 0x000084CE }, /* GL_TEXTURE14 */
-   { 43077, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 43094, 0x000084CF }, /* GL_TEXTURE15 */
-   { 43107, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 43124, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 43137, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 43154, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 43167, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 43184, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 43197, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 43214, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 43227, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 43244, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 43260, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 43272, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 43285, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 43302, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 43315, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 43332, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 43345, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 43362, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 43375, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 43392, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 43405, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 43422, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 43435, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 43452, 0x000084DA }, /* GL_TEXTURE26 */
-   { 43465, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 43482, 0x000084DB }, /* GL_TEXTURE27 */
-   { 43495, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 43512, 0x000084DC }, /* GL_TEXTURE28 */
-   { 43525, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 43542, 0x000084DD }, /* GL_TEXTURE29 */
-   { 43555, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 43572, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 43588, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 43600, 0x000084DE }, /* GL_TEXTURE30 */
-   { 43613, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 43630, 0x000084DF }, /* GL_TEXTURE31 */
-   { 43643, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 43660, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 43676, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 43688, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 43704, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 43716, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 43732, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 43744, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 43760, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 43772, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 43788, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 43800, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 43816, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 43828, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 43844, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 43858, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 43878, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 43902, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 43916, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 43936, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 43960, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 43974, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 43992, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 44014, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 44040, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 44062, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 44084, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 44112, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 44144, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 44166, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 44194, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 44226, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 44248, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 44274, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 44300, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
-   { 44330, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 44358, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 44390, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 44422, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-   { 44454, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 44483, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 44516, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 44548, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 44563, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 44584, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 44609, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 44627, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 44651, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 44669, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
-   { 44691, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 44728, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
-   { 44769, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 44794, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
-   { 44823, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 44854, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 44884, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 44914, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 44949, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 44980, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 45018, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 45045, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 45077, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 45111, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 45135, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 45163, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 45187, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 45215, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 45248, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 45272, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 45294, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 45316, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 45342, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 45376, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 45409, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 45446, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 45474, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 45506, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 45529, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 45567, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 45609, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 45640, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 45668, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 45698, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 45726, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 45751, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 45771, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 45795, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 45826, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 45861, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 45896, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 45927, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 45962, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 45997, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 46028, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 46063, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 46098, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 46122, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 46153, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 46188, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 46223, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 46254, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 46289, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 46324, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 46355, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 46390, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 46425, 0x0000884F }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 46454, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 46471, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 46493, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 46519, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 46534, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 46555, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 46575, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
-   { 46599, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 46625, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 46655, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 46675, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 46699, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 46716, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 46733, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 46750, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 46773, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 46790, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 46815, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 46837, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 46863, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 46881, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 46907, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 46933, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 46963, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 46990, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 47015, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 47035, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 47059, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 47086, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 47113, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 47140, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 47166, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 47196, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 47218, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 47236, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 47276, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 47306, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 47334, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 47362, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 47390, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 47411, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 47430, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 47452, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 47471, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 47491, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 47521, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 47552, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 47573, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 47598, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 47622, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 47642, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 47666, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 47686, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 47709, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 47732, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 47756, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 47784, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 47814, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 47839, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 47873, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 47890, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 47908, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 47930, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 47948, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 47966, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 47985, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 48005, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 48024, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 48053, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 48070, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 48092, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 48122, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 48151, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 48187, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 48224, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 48265, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 48298, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 48332, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 48370, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 48406, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 48440, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 48478, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 48513, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 48552, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 48593, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 48638, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 48669, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 48704, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 48745, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 48790, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 48816, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 48846, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 48878, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 48908, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 48942, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 48958, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 48989, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 49024, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 49052, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 49084, 0x00000004 }, /* GL_TRIANGLES */
-   { 49097, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 49120, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 49147, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 49163, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 49184, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 49202, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 49230, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 49262, 0x00000001 }, /* GL_TRUE */
-   { 49270, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 49289, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-   { 49318, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 49338, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 49361, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 49381, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 49402, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 49424, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 49446, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 49466, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 49487, 0x00009118 }, /* GL_UNSIGNALED */
-   { 49501, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 49518, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 49545, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 49568, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 49584, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 49616, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 49643, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 49674, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 49695, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 49720, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 49744, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 49769, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 49800, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 49835, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 49863, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 49887, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 49915, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 49942, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 49975, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 50012, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 50043, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 50070, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 50103, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 50140, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 50171, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 50203, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 50239, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 50266, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 50297, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 50328, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 50363, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 50392, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 50425, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 50446, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 50471, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 50492, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 50517, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 50538, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 50563, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 50586, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 50604, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 50634, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 50668, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 50694, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 50724, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 50758, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 50784, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 50808, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 50836, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 50864, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 50891, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 50923, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 50954, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 50968, 0x00002A20 }, /* GL_V2F */
-   { 50975, 0x00002A21 }, /* GL_V3F */
-   { 50982, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 51001, 0x00001F00 }, /* GL_VENDOR */
-   { 51011, 0x00001F02 }, /* GL_VERSION */
-   { 51022, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 51038, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 51062, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 51092, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 51123, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 51158, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 51182, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 51203, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 51226, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 51247, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 51274, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 51302, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 51330, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 51358, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 51386, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 51414, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 51442, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 51469, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 51496, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 51523, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 51550, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 51577, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 51604, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 51631, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 51658, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 51685, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 51723, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 51765, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 51800, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 51831, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 51866, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 51897, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 51932, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 51966, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 52004, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 52035, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 52070, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 52098, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 52130, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 52160, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 52194, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 52222, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 52254, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 52274, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 52296, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 52325, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 52346, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 52375, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 52408, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 52440, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 52467, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 52498, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 52528, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 52545, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 52566, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 52593, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 52605, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 52621, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 52639, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 52654, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 52674, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 52705, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 52740, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 52775, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 52795, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 52823, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 52851, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 52876, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 52901, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 52928, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 52955, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 52980, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 53005, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 53029, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 53048, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 53062, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 53080, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 53098, 0x00001506 }, /* GL_XOR */
-   { 53105, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 53124, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 53138, 0x00000000 }, /* GL_ZERO */
-   { 53146, 0x00000D16 }, /* GL_ZOOM_X */
-   { 53156, 0x00000D17 }, /* GL_ZOOM_Y */
+   {   644, 0x0000881C }, /* GL_ALPHA16F_ARB */
+   {   660, 0x00008D8A }, /* GL_ALPHA16I_EXT */
+   {   676, 0x00008D78 }, /* GL_ALPHA16UI_EXT */
+   {   693, 0x0000803E }, /* GL_ALPHA16_EXT */
+   {   708, 0x00008816 }, /* GL_ALPHA32F_ARB */
+   {   724, 0x00008D84 }, /* GL_ALPHA32I_EXT */
+   {   740, 0x00008D72 }, /* GL_ALPHA32UI_EXT */
+   {   757, 0x0000803B }, /* GL_ALPHA4 */
+   {   767, 0x0000803B }, /* GL_ALPHA4_EXT */
+   {   781, 0x0000803C }, /* GL_ALPHA8 */
+   {   791, 0x00008D90 }, /* GL_ALPHA8I_EXT */
+   {   806, 0x00008D7E }, /* GL_ALPHA8UI_EXT */
+   {   822, 0x0000803C }, /* GL_ALPHA8_EXT */
+   {   836, 0x00000D1D }, /* GL_ALPHA_BIAS */
+   {   850, 0x00000D55 }, /* GL_ALPHA_BITS */
+   {   864, 0x00008D97 }, /* GL_ALPHA_INTEGER_EXT */
+   {   885, 0x00000D1C }, /* GL_ALPHA_SCALE */
+   {   900, 0x00000BC0 }, /* GL_ALPHA_TEST */
+   {   914, 0x00000BC1 }, /* GL_ALPHA_TEST_FUNC */
+   {   933, 0x00000BC2 }, /* GL_ALPHA_TEST_REF */
+   {   951, 0x0000911A }, /* GL_ALREADY_SIGNALED */
+   {   971, 0x00000207 }, /* GL_ALWAYS */
+   {   981, 0x00001200 }, /* GL_AMBIENT */
+   {   992, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
+   {  1015, 0x00001501 }, /* GL_AND */
+   {  1022, 0x00001504 }, /* GL_AND_INVERTED */
+   {  1038, 0x00001502 }, /* GL_AND_REVERSE */
+   {  1053, 0x00008892 }, /* GL_ARRAY_BUFFER */
+   {  1069, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
+   {  1093, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
+   {  1121, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
+   {  1141, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
+   {  1168, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
+   {  1192, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
+   {  1218, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
+   {  1242, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
+   {  1264, 0x00000D80 }, /* GL_AUTO_NORMAL */
+   {  1279, 0x00000409 }, /* GL_AUX0 */
+   {  1287, 0x0000040A }, /* GL_AUX1 */
+   {  1295, 0x0000040B }, /* GL_AUX2 */
+   {  1303, 0x0000040C }, /* GL_AUX3 */
+   {  1311, 0x00000C00 }, /* GL_AUX_BUFFERS */
+   {  1326, 0x00000405 }, /* GL_BACK */
+   {  1334, 0x00000402 }, /* GL_BACK_LEFT */
+   {  1347, 0x00000403 }, /* GL_BACK_RIGHT */
+   {  1361, 0x000080E0 }, /* GL_BGR */
+   {  1368, 0x000080E1 }, /* GL_BGRA */
+   {  1376, 0x000080E1 }, /* GL_BGRA_EXT */
+   {  1388, 0x00008D9B }, /* GL_BGRA_INTEGER */
+   {  1404, 0x00008D9B }, /* GL_BGRA_INTEGER_EXT */
+   {  1424, 0x00008D9A }, /* GL_BGR_INTEGER */
+   {  1439, 0x00008D9A }, /* GL_BGR_INTEGER_EXT */
+   {  1458, 0x00001A00 }, /* GL_BITMAP */
+   {  1468, 0x00000704 }, /* GL_BITMAP_TOKEN */
+   {  1484, 0x00000BE2 }, /* GL_BLEND */
+   {  1493, 0x00008005 }, /* GL_BLEND_COLOR */
+   {  1508, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
+   {  1527, 0x00000BE0 }, /* GL_BLEND_DST */
+   {  1540, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
+   {  1559, 0x000080CA }, /* GL_BLEND_DST_ALPHA_OES */
+   {  1582, 0x000080C8 }, /* GL_BLEND_DST_RGB */
+   {  1599, 0x000080C8 }, /* GL_BLEND_DST_RGB_OES */
+   {  1620, 0x00008009 }, /* GL_BLEND_EQUATION */
+   {  1638, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
+   {  1662, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
+   {  1690, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_OES */
+   {  1718, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
+   {  1740, 0x00008009 }, /* GL_BLEND_EQUATION_OES */
+   {  1762, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
+   {  1784, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
+   {  1810, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_OES */
+   {  1836, 0x00000BE1 }, /* GL_BLEND_SRC */
+   {  1849, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
+   {  1868, 0x000080CB }, /* GL_BLEND_SRC_ALPHA_OES */
+   {  1891, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
+   {  1908, 0x000080C9 }, /* GL_BLEND_SRC_RGB_OES */
+   {  1929, 0x00001905 }, /* GL_BLUE */
+   {  1937, 0x00000D1B }, /* GL_BLUE_BIAS */
+   {  1950, 0x00000D54 }, /* GL_BLUE_BITS */
+   {  1963, 0x00008D96 }, /* GL_BLUE_INTEGER */
+   {  1979, 0x00008D96 }, /* GL_BLUE_INTEGER_EXT */
+   {  1999, 0x00000D1A }, /* GL_BLUE_SCALE */
+   {  2013, 0x00008B56 }, /* GL_BOOL */
+   {  2021, 0x00008B56 }, /* GL_BOOL_ARB */
+   {  2033, 0x00008B57 }, /* GL_BOOL_VEC2 */
+   {  2046, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
+   {  2063, 0x00008B58 }, /* GL_BOOL_VEC3 */
+   {  2076, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
+   {  2093, 0x00008B59 }, /* GL_BOOL_VEC4 */
+   {  2106, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
+   {  2123, 0x000088BB }, /* GL_BUFFER_ACCESS */
+   {  2140, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
+   {  2161, 0x0000911F }, /* GL_BUFFER_ACCESS_FLAGS */
+   {  2184, 0x000088BB }, /* GL_BUFFER_ACCESS_OES */
+   {  2205, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+   {  2236, 0x000088BC }, /* GL_BUFFER_MAPPED */
+   {  2253, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
+   {  2274, 0x000088BC }, /* GL_BUFFER_MAPPED_OES */
+   {  2295, 0x00009120 }, /* GL_BUFFER_MAP_LENGTH */
+   {  2316, 0x00009121 }, /* GL_BUFFER_MAP_OFFSET */
+   {  2337, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
+   {  2359, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
+   {  2385, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_OES */
+   {  2411, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */
+   {  2434, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+   {  2468, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  2483, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  2502, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  2518, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  2538, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  2557, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  2583, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  2606, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  2634, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  2653, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  2675, 0x00001400 }, /* GL_BYTE */
+   {  2683, 0x00002A24 }, /* GL_C3F_V3F */
+   {  2694, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2709, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2721, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2733, 0x00000901 }, /* GL_CCW */
+   {  2740, 0x00002900 }, /* GL_CLAMP */
+   {  2749, 0x0000891B }, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
+   {  2777, 0x0000891C }, /* GL_CLAMP_READ_COLOR */
+   {  2797, 0x0000891C }, /* GL_CLAMP_READ_COLOR_ARB */
+   {  2821, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2840, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2863, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2887, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2904, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2926, 0x0000891A }, /* GL_CLAMP_VERTEX_COLOR_ARB */
+   {  2952, 0x00001500 }, /* GL_CLEAR */
+   {  2961, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2986, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  3015, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  3041, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  3070, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  3096, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  3123, 0x00003000 }, /* GL_CLIP_DISTANCE0 */
+   {  3141, 0x00003001 }, /* GL_CLIP_DISTANCE1 */
+   {  3159, 0x00003002 }, /* GL_CLIP_DISTANCE2 */
+   {  3177, 0x00003003 }, /* GL_CLIP_DISTANCE3 */
+   {  3195, 0x00003004 }, /* GL_CLIP_DISTANCE4 */
+   {  3213, 0x00003005 }, /* GL_CLIP_DISTANCE5 */
+   {  3231, 0x00003006 }, /* GL_CLIP_DISTANCE6 */
+   {  3249, 0x00003007 }, /* GL_CLIP_DISTANCE7 */
+   {  3267, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  3282, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  3297, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  3312, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  3327, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  3342, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  3357, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  3390, 0x00000A00 }, /* GL_COEFF */
+   {  3399, 0x00001800 }, /* GL_COLOR */
+   {  3408, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  3423, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  3453, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  3487, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  3510, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  3530, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  3552, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  3572, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  3593, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  3618, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_OES */
+   {  3643, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  3664, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  3686, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  3712, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  3734, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  3760, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  3782, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  3808, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  3830, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  3856, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  3878, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  3904, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  3926, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  3952, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3977, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3998, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  4023, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  4044, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  4069, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  4090, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  4115, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  4136, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  4161, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  4182, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  4207, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  4228, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  4253, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  4274, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  4299, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  4320, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  4345, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  4365, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  4386, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  4401, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  4418, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  4436, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  4454, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  4477, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  4505, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  4521, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  4541, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  4569, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  4601, 0x00008458 }, /* GL_COLOR_SUM */
+   {  4614, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  4631, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  4646, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  4672, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  4702, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  4732, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  4752, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  4776, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  4801, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  4830, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  4859, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  4881, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  4907, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  4933, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  4959, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4989, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  5019, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  5049, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  5083, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  5117, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  5147, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  5181, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  5215, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  5239, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  5267, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  5295, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  5316, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  5341, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  5362, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  5387, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  5412, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  5431, 0x00008570 }, /* GL_COMBINE */
+   {  5442, 0x00008503 }, /* GL_COMBINE4 */
+   {  5454, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  5471, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  5492, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  5513, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  5528, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  5543, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  5558, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  5577, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  5596, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  5632, 0x0000884E }, /* GL_COMPARE_REF_TO_TEXTURE */
+   {  5658, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  5682, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  5710, 0x00001300 }, /* GL_COMPILE */
+   {  5721, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  5744, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  5762, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  5782, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  5806, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  5830, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  5858, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  5882, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  5912, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  5946, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  5974, 0x00008225 }, /* GL_COMPRESSED_RED */
+   {  5992, 0x00008DBB }, /* GL_COMPRESSED_RED_RGTC1 */
+   {  6016, 0x00008226 }, /* GL_COMPRESSED_RG */
+   {  6033, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  6051, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  6070, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  6093, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  6122, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  6155, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  6188, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  6221, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  6243, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  6271, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  6303, 0x00008DBD }, /* GL_COMPRESSED_RG_RGTC2 */
+   {  6326, 0x00008DBC }, /* GL_COMPRESSED_SIGNED_RED_RGTC1 */
+   {  6357, 0x00008DBE }, /* GL_COMPRESSED_SIGNED_RG_RGTC2 */
+   {  6387, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  6412, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  6443, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  6462, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  6487, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  6517, 0x0000911C }, /* GL_CONDITION_SATISFIED */
+   {  6540, 0x00008576 }, /* GL_CONSTANT */
+   {  6552, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  6570, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  6592, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  6608, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  6632, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  6654, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  6672, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  6694, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  6710, 0x00000002 }, /* GL_CONTEXT_COMPATIBILITY_PROFILE_BIT */
+   {  6747, 0x00000001 }, /* GL_CONTEXT_CORE_PROFILE_BIT */
+   {  6775, 0x0000821E }, /* GL_CONTEXT_FLAGS */
+   {  6792, 0x00000001 }, /* GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT */
+   {  6831, 0x00000004 }, /* GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB */
+   {  6869, 0x00009126 }, /* GL_CONTEXT_PROFILE_MASK */
+   {  6893, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  6911, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  6929, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  6957, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  6988, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  7015, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  7046, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  7073, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  7104, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  7132, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  7164, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  7186, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  7212, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  7234, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  7260, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  7281, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  7306, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  7323, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  7344, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  7364, 0x00008862 }, /* GL_COORD_REPLACE_OES */
+   {  7385, 0x00001503 }, /* GL_COPY */
+   {  7393, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  7410, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  7430, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  7450, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  7471, 0x00000B44 }, /* GL_CULL_FACE */
+   {  7484, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  7502, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  7521, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  7553, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  7588, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  7609, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  7624, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  7641, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  7662, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  7688, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  7705, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  7727, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  7755, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  7776, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  7810, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  7843, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  7861, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  7891, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_OES */
+   {  7921, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  7940, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  7957, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  7978, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  8002, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  8029, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  8053, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  8080, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  8113, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  8147, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  8180, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  8207, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  8233, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  8258, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  8287, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  8309, 0x00000900 }, /* GL_CW */
+   {  8315, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  8336, 0x00008244 }, /* GL_DEBUG_CALLBACK_FUNCTION_ARB */
+   {  8367, 0x00008245 }, /* GL_DEBUG_CALLBACK_USER_PARAM_ARB */
+   {  8400, 0x00009145 }, /* GL_DEBUG_LOGGED_MESSAGES_ARB */
+   {  8429, 0x00008243 }, /* GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB */
+   {  8469, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  8490, 0x00008242 }, /* GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB */
+   {  8522, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  8542, 0x00009146 }, /* GL_DEBUG_SEVERITY_HIGH_ARB */
+   {  8569, 0x00009148 }, /* GL_DEBUG_SEVERITY_LOW_ARB */
+   {  8595, 0x00009147 }, /* GL_DEBUG_SEVERITY_MEDIUM_ARB */
+   {  8624, 0x00008246 }, /* GL_DEBUG_SOURCE_API_ARB */
+   {  8648, 0x0000824A }, /* GL_DEBUG_SOURCE_APPLICATION_ARB */
+   {  8680, 0x0000824B }, /* GL_DEBUG_SOURCE_OTHER_ARB */
+   {  8706, 0x00008248 }, /* GL_DEBUG_SOURCE_SHADER_COMPILER_ARB */
+   {  8742, 0x00008249 }, /* GL_DEBUG_SOURCE_THIRD_PARTY_ARB */
+   {  8774, 0x00008247 }, /* GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB */
+   {  8808, 0x0000824D }, /* GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB */
+   {  8846, 0x0000824C }, /* GL_DEBUG_TYPE_ERROR_ARB */
+   {  8870, 0x00008251 }, /* GL_DEBUG_TYPE_OTHER_ARB */
+   {  8894, 0x00008250 }, /* GL_DEBUG_TYPE_PERFORMANCE_ARB */
+   {  8924, 0x0000824F }, /* GL_DEBUG_TYPE_PORTABILITY_ARB */
+   {  8954, 0x0000824E }, /* GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB */
+   {  8991, 0x00002101 }, /* GL_DECAL */
+   {  9000, 0x00001E03 }, /* GL_DECR */
+   {  9008, 0x00008508 }, /* GL_DECR_WRAP */
+   {  9021, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  9038, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  9055, 0x00001801 }, /* GL_DEPTH */
+   {  9064, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  9084, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
+   {  9108, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */
+   {  9132, 0x00008CAD }, /* GL_DEPTH32F_STENCIL8 */
+   {  9153, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  9173, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  9197, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */
+   {  9221, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  9235, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  9249, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  9269, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  9294, 0x00008223 }, /* GL_DEPTH_BUFFER */
+   {  9310, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  9330, 0x0000864F }, /* GL_DEPTH_CLAMP */
+   {  9345, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  9363, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  9384, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  9403, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  9424, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  9449, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */
+   {  9474, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  9500, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  9521, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  9546, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */
+   {  9571, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  9597, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  9618, 0x00008CAC }, /* GL_DEPTH_COMPONENT32F */
+   {  9640, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  9665, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */
+   {  9690, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  9716, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  9730, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  9745, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  9760, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  9777, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  9805, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
+   {  9826, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  9846, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */
+   {  9867, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  9895, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  9923, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  9937, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  9959, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  9985, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   { 10004, 0x00001201 }, /* GL_DIFFUSE */
+   { 10015, 0x00000BD0 }, /* GL_DITHER */
+   { 10025, 0x00000A02 }, /* GL_DOMAIN */
+   { 10035, 0x00001100 }, /* GL_DONT_CARE */
+   { 10048, 0x000086AE }, /* GL_DOT3_RGB */
+   { 10060, 0x000086AF }, /* GL_DOT3_RGBA */
+   { 10073, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   { 10090, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   { 10107, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   { 10123, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   { 10139, 0x0000140A }, /* GL_DOUBLE */
+   { 10149, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   { 10165, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   { 10180, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   { 10196, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   { 10216, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   { 10236, 0x00008825 }, /* GL_DRAW_BUFFER0_NV */
+   { 10255, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   { 10271, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   { 10288, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   { 10309, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   { 10330, 0x0000882F }, /* GL_DRAW_BUFFER10_NV */
+   { 10350, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   { 10367, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   { 10388, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   { 10409, 0x00008830 }, /* GL_DRAW_BUFFER11_NV */
+   { 10429, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   { 10446, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   { 10467, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   { 10488, 0x00008831 }, /* GL_DRAW_BUFFER12_NV */
+   { 10508, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   { 10525, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   { 10546, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   { 10567, 0x00008832 }, /* GL_DRAW_BUFFER13_NV */
+   { 10587, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   { 10604, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   { 10625, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   { 10646, 0x00008833 }, /* GL_DRAW_BUFFER14_NV */
+   { 10666, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   { 10683, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   { 10704, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   { 10725, 0x00008834 }, /* GL_DRAW_BUFFER15_NV */
+   { 10745, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   { 10765, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   { 10785, 0x00008826 }, /* GL_DRAW_BUFFER1_NV */
+   { 10804, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   { 10820, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   { 10840, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   { 10860, 0x00008827 }, /* GL_DRAW_BUFFER2_NV */
+   { 10879, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   { 10895, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   { 10915, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   { 10935, 0x00008828 }, /* GL_DRAW_BUFFER3_NV */
+   { 10954, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   { 10970, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   { 10990, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   { 11010, 0x00008829 }, /* GL_DRAW_BUFFER4_NV */
+   { 11029, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   { 11045, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   { 11065, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   { 11085, 0x0000882A }, /* GL_DRAW_BUFFER5_NV */
+   { 11104, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   { 11120, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   { 11140, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   { 11160, 0x0000882B }, /* GL_DRAW_BUFFER6_NV */
+   { 11179, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   { 11195, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   { 11215, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   { 11235, 0x0000882C }, /* GL_DRAW_BUFFER7_NV */
+   { 11254, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   { 11270, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   { 11290, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   { 11310, 0x0000882D }, /* GL_DRAW_BUFFER8_NV */
+   { 11329, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   { 11345, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   { 11365, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   { 11385, 0x0000882E }, /* GL_DRAW_BUFFER9_NV */
+   { 11404, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   { 11424, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
+   { 11452, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   { 11484, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   { 11508, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   { 11528, 0x00000304 }, /* GL_DST_ALPHA */
+   { 11541, 0x00000306 }, /* GL_DST_COLOR */
+   { 11554, 0x0000877A }, /* GL_DU8DV8_ATI */
+   { 11568, 0x00008779 }, /* GL_DUDV_ATI */
+   { 11580, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   { 11596, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   { 11616, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   { 11632, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   { 11652, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   { 11668, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   { 11688, 0x00000B43 }, /* GL_EDGE_FLAG */
+   { 11701, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   { 11720, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   { 11754, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   { 11792, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   { 11819, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   { 11845, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   { 11869, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   { 11901, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   { 11937, 0x00001600 }, /* GL_EMISSION */
+   { 11949, 0x00002000 }, /* GL_ENABLE_BIT */
+   { 11963, 0x00000202 }, /* GL_EQUAL */
+   { 11972, 0x00001509 }, /* GL_EQUIV */
+   { 11981, 0x00008D64 }, /* GL_ETC1_RGB8_OES */
+   { 11998, 0x00010000 }, /* GL_EVAL_BIT */
+   { 12010, 0x00000800 }, /* GL_EXP */
+   { 12017, 0x00000801 }, /* GL_EXP2 */
+   { 12025, 0x00001F03 }, /* GL_EXTENSIONS */
+   { 12039, 0x00002400 }, /* GL_EYE_LINEAR */
+   { 12053, 0x00002502 }, /* GL_EYE_PLANE */
+   { 12066, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   { 12091, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   { 12108, 0x00000000 }, /* GL_FALSE */
+   { 12117, 0x00001101 }, /* GL_FASTEST */
+   { 12128, 0x00001C01 }, /* GL_FEEDBACK */
+   { 12140, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   { 12167, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   { 12191, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   { 12215, 0x00001B02 }, /* GL_FILL */
+   { 12223, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
+   { 12250, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   { 12281, 0x0000140C }, /* GL_FIXED */
+   { 12290, 0x0000140C }, /* GL_FIXED_OES */
+   { 12303, 0x0000891D }, /* GL_FIXED_ONLY */
+   { 12317, 0x0000891D }, /* GL_FIXED_ONLY_ARB */
+   { 12335, 0x00001D00 }, /* GL_FLAT */
+   { 12343, 0x00001406 }, /* GL_FLOAT */
+   { 12352, 0x00008DAD }, /* GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+   { 12386, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   { 12400, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   { 12418, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   { 12434, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   { 12450, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   { 12464, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   { 12482, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   { 12498, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   { 12514, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   { 12528, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   { 12546, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   { 12562, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   { 12578, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   { 12592, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   { 12610, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   { 12624, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 12642, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 12656, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 12674, 0x00000B60 }, /* GL_FOG */
+   { 12681, 0x00000080 }, /* GL_FOG_BIT */
+   { 12692, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 12705, 0x00008451 }, /* GL_FOG_COORD */
+   { 12718, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 12736, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 12760, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 12799, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 12842, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 12874, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 12905, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 12934, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 12959, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 12978, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 13012, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 13039, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 13065, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 13089, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 13106, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 13121, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 13145, 0x00000B64 }, /* GL_FOG_END */
+   { 13156, 0x00000C54 }, /* GL_FOG_HINT */
+   { 13168, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 13181, 0x00000B65 }, /* GL_FOG_MODE */
+   { 13193, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 13212, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 13237, 0x00000B63 }, /* GL_FOG_START */
+   { 13250, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 13268, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 13292, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 13311, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 13334, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 13369, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
+   { 13408, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 13423, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 13460, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 13496, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 13537, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 13578, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 13615, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 13652, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
+   { 13686, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
+   { 13724, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 13762, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 13804, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
+   { 13846, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 13884, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 13926, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
+   { 13968, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 14003, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 14042, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 14091, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
+   { 14140, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 14188, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 14240, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
+   { 14292, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 14332, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 14376, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 14416, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 14460, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
+   { 14504, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
+   { 14527, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 14554, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
+   { 14581, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 14605, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 14633, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
+   { 14661, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 14684, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 14703, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 14740, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 14781, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
+   { 14822, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
+   { 14859, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 14900, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
+   { 14941, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+   { 14979, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 15021, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
+   { 15063, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 15114, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 15152, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
+   { 15190, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+   { 15232, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
+   { 15272, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
+   { 15316, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 15361, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 15410, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
+   { 15459, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 15497, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
+   { 15539, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+   { 15577, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 15619, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
+   { 15661, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
+   { 15680, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 15712, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 15737, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 15764, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 15795, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
+   { 15826, 0x00000404 }, /* GL_FRONT */
+   { 15835, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 15853, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 15867, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 15881, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 15896, 0x00008006 }, /* GL_FUNC_ADD */
+   { 15908, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 15924, 0x00008006 }, /* GL_FUNC_ADD_OES */
+   { 15940, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 15965, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 15994, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
+   { 16023, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 16040, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 16061, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
+   { 16082, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 16101, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 16125, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 16154, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 16178, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */
+   { 16201, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+   { 16228, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */
+   { 16252, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+   { 16280, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */
+   { 16299, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
+   { 16322, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */
+   { 16347, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+   { 16376, 0x00000206 }, /* GL_GEQUAL */
+   { 16386, 0x0000912F }, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
+   { 16417, 0x00000204 }, /* GL_GREATER */
+   { 16428, 0x00001904 }, /* GL_GREEN */
+   { 16437, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 16451, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 16465, 0x00008D95 }, /* GL_GREEN_INTEGER */
+   { 16482, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */
+   { 16503, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 16518, 0x00008253 }, /* GL_GUILTY_CONTEXT_RESET_ARB */
+   { 16546, 0x0000140B }, /* GL_HALF_FLOAT */
+   { 16560, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
+   { 16578, 0x00008DF2 }, /* GL_HIGH_FLOAT */
+   { 16592, 0x00008DF5 }, /* GL_HIGH_INT */
+   { 16604, 0x00008000 }, /* GL_HINT_BIT */
+   { 16616, 0x00008024 }, /* GL_HISTOGRAM */
+   { 16629, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 16653, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 16681, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 16704, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 16731, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 16748, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 16768, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 16792, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 16816, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 16844, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 16872, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 16904, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 16926, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 16952, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 16970, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 16992, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 17011, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 17034, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 17049, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 17069, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+   { 17105, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 17145, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+   { 17179, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 17217, 0x00001E02 }, /* GL_INCR */
+   { 17225, 0x00008507 }, /* GL_INCR_WRAP */
+   { 17238, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 17255, 0x00008222 }, /* GL_INDEX */
+   { 17264, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 17279, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 17309, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 17343, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 17366, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 17388, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 17408, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 17422, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 17443, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 17461, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 17475, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 17491, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 17506, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 17525, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 17544, 0x00008254 }, /* GL_INNOCENT_CONTEXT_RESET_ARB */
+   { 17574, 0x00001404 }, /* GL_INT */
+   { 17581, 0x00008049 }, /* GL_INTENSITY */
+   { 17594, 0x0000804C }, /* GL_INTENSITY12 */
+   { 17609, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 17628, 0x0000804D }, /* GL_INTENSITY16 */
+   { 17643, 0x0000881D }, /* GL_INTENSITY16F_ARB */
+   { 17663, 0x00008D8B }, /* GL_INTENSITY16I_EXT */
+   { 17683, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */
+   { 17704, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 17723, 0x00008817 }, /* GL_INTENSITY32F_ARB */
+   { 17743, 0x00008D85 }, /* GL_INTENSITY32I_EXT */
+   { 17763, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */
+   { 17784, 0x0000804A }, /* GL_INTENSITY4 */
+   { 17798, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 17816, 0x0000804B }, /* GL_INTENSITY8 */
+   { 17830, 0x00008D91 }, /* GL_INTENSITY8I_EXT */
+   { 17849, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */
+   { 17869, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 17887, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 17904, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */
+   { 17927, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
+   { 17954, 0x00008575 }, /* GL_INTERPOLATE */
+   { 17969, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 17988, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 18007, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
+   { 18029, 0x00008D9F }, /* GL_INT_2_10_10_10_REV */
+   { 18051, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */
+   { 18069, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */
+   { 18093, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */
+   { 18121, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */
+   { 18143, 0x00008DCA }, /* GL_INT_SAMPLER_2D */
+   { 18161, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */
+   { 18185, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */
+   { 18213, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */
+   { 18235, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */
+   { 18258, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */
+   { 18285, 0x00008DCB }, /* GL_INT_SAMPLER_3D */
+   { 18303, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */
+   { 18325, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */
+   { 18347, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */
+   { 18373, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */
+   { 18393, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */
+   { 18417, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 18429, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 18445, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 18457, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 18473, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 18485, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 18501, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 18517, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 18550, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 18587, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
+   { 18624, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 18645, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 18662, 0x0000862B }, /* GL_INVERSE_NV */
+   { 18676, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 18700, 0x0000150A }, /* GL_INVERT */
+   { 18710, 0x00001E00 }, /* GL_KEEP */
+   { 18718, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
+   { 18744, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 18774, 0x00000406 }, /* GL_LEFT */
+   { 18782, 0x00000203 }, /* GL_LEQUAL */
+   { 18792, 0x00000201 }, /* GL_LESS */
+   { 18800, 0x00004000 }, /* GL_LIGHT0 */
+   { 18810, 0x00004001 }, /* GL_LIGHT1 */
+   { 18820, 0x00004002 }, /* GL_LIGHT2 */
+   { 18830, 0x00004003 }, /* GL_LIGHT3 */
+   { 18840, 0x00004004 }, /* GL_LIGHT4 */
+   { 18850, 0x00004005 }, /* GL_LIGHT5 */
+   { 18860, 0x00004006 }, /* GL_LIGHT6 */
+   { 18870, 0x00004007 }, /* GL_LIGHT7 */
+   { 18880, 0x00000B50 }, /* GL_LIGHTING */
+   { 18892, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 18908, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 18931, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 18960, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 18993, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 19021, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 19045, 0x00001B01 }, /* GL_LINE */
+   { 19053, 0x00002601 }, /* GL_LINEAR */
+   { 19063, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 19085, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 19115, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 19146, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 19170, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 19195, 0x00000001 }, /* GL_LINES */
+   { 19204, 0x0000000A }, /* GL_LINES_ADJACENCY */
+   { 19223, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
+   { 19246, 0x00000004 }, /* GL_LINE_BIT */
+   { 19258, 0x00000002 }, /* GL_LINE_LOOP */
+   { 19271, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 19291, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 19306, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 19326, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 19342, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 19366, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 19389, 0x00000003 }, /* GL_LINE_STRIP */
+   { 19403, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */
+   { 19427, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
+   { 19455, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 19469, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 19483, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 19509, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 19529, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 19544, 0x00000B32 }, /* GL_LIST_BASE */
+   { 19557, 0x00020000 }, /* GL_LIST_BIT */
+   { 19569, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 19583, 0x00000B30 }, /* GL_LIST_MODE */
+   { 19596, 0x00000101 }, /* GL_LOAD */
+   { 19604, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 19616, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 19633, 0x00008252 }, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
+   { 19662, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 19676, 0x00008DF0 }, /* GL_LOW_FLOAT */
+   { 19689, 0x00008DF3 }, /* GL_LOW_INT */
+   { 19700, 0x00001909 }, /* GL_LUMINANCE */
+   { 19713, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 19728, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 19751, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 19778, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 19800, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 19826, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 19845, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 19860, 0x0000881E }, /* GL_LUMINANCE16F_ARB */
+   { 19880, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */
+   { 19900, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */
+   { 19921, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 19944, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 19971, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 19990, 0x00008818 }, /* GL_LUMINANCE32F_ARB */
+   { 20010, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */
+   { 20030, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */
+   { 20051, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 20065, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 20086, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 20111, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 20129, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 20150, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 20175, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 20189, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */
+   { 20208, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */
+   { 20228, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 20249, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 20274, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 20292, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 20311, 0x0000881F }, /* GL_LUMINANCE_ALPHA16F_ARB */
+   { 20337, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */
+   { 20363, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */
+   { 20390, 0x00008819 }, /* GL_LUMINANCE_ALPHA32F_ARB */
+   { 20416, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */
+   { 20442, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */
+   { 20469, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */
+   { 20494, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */
+   { 20520, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
+   { 20551, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */
+   { 20576, 0x0000821B }, /* GL_MAJOR_VERSION */
+   { 20593, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 20609, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 20629, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 20651, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 20665, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 20680, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 20704, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 20728, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 20752, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 20776, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 20793, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 20810, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 20838, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 20867, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 20896, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 20925, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 20954, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 20983, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 21012, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 21040, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 21068, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 21096, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 21124, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 21152, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 21180, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 21208, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 21236, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 21264, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 21280, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 21300, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 21322, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 21336, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 21351, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 21375, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 21399, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 21423, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 21447, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 21464, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 21481, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 21509, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 21538, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 21567, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 21596, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 21625, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 21654, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 21683, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 21711, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 21739, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 21767, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 21795, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 21823, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 21851, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 21879, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 21907, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 21935, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 21948, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 21974, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 22003, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 22031, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 22047, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 22062, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 22088, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 22105, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 22120, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 22134, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 22150, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 22166, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 22182, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 22198, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 22214, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 22230, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 22246, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 22262, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 22278, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 22294, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 22309, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 22323, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 22339, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 22355, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 22371, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 22387, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 22403, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 22419, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 22435, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 22451, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 22467, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 22483, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 22498, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 22512, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 22528, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 22544, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 22559, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 22573, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 22588, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 22602, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 22617, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 22631, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 22646, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 22660, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 22675, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 22689, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 22704, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 22719, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 22745, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+   { 22786, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
+   { 22812, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 22846, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
+   { 22880, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 22911, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
+   { 22942, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 22975, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
+   { 23008, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 23039, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
+   { 23070, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 23085, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 23107, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
+   { 23129, 0x00008008 }, /* GL_MAX */
+   { 23136, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 23159, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
+   { 23186, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
+   { 23214, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 23246, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 23272, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 23305, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 23331, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 23365, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */
+   { 23387, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 23406, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
+   { 23431, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 23460, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 23492, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 23528, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 23564, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 23604, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 23630, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 23660, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 23685, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 23714, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 23743, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 23776, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
+   { 23809, 0x00009144 }, /* GL_MAX_DEBUG_LOGGED_MESSAGES_ARB */
+   { 23842, 0x00009143 }, /* GL_MAX_DEBUG_MESSAGE_LENGTH_ARB */
+   { 23874, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 23894, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 23918, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 23942, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_NV */
+   { 23965, 0x000088FC }, /* GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
+   { 23997, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 24021, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 24046, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 24064, 0x00008008 }, /* GL_MAX_EXT */
+   { 24075, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
+   { 24108, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 24143, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 24182, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+   { 24214, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
+   { 24247, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
+   { 24281, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
+   { 24313, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
+   { 24349, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
+   { 24385, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
+   { 24425, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
+   { 24465, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
+   { 24509, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
+   { 24544, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
+   { 24583, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+   { 24622, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 24636, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 24656, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 24694, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 24723, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 24747, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 24775, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
+   { 24803, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 24826, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 24863, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 24899, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 24926, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 24955, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 24989, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 25025, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 25052, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 25084, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 25120, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 25149, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 25178, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 25206, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 25244, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 25288, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 25331, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 25365, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 25404, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 25441, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 25479, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 25522, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 25565, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 25595, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 25626, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
+   { 25654, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 25690, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 25726, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 25756, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+   { 25786, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 25820, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 25853, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
+   { 25878, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 25907, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
+   { 25936, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 25951, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
+   { 25970, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 25997, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 26017, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 26041, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+   { 26068, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
+   { 26099, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 26121, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 26147, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 26174, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 26205, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 26229, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
+   { 26257, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 26291, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 26311, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 26338, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 26359, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 26384, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 26409, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 26444, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+   { 26493, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+   { 26546, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+   { 26589, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+   { 26636, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+   { 26682, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+   { 26732, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
+   { 26758, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 26780, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 26806, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
+   { 26829, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 26851, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 26877, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+   { 26909, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 26943, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 26981, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 27014, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 27051, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+   { 27081, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 27105, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
+   { 27129, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+   { 27166, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 27187, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
+   { 27203, 0x00008DF4 }, /* GL_MEDIUM_INT */
+   { 27217, 0x00008007 }, /* GL_MIN */
+   { 27224, 0x0000802E }, /* GL_MINMAX */
+   { 27234, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 27248, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 27265, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 27286, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 27301, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 27320, 0x0000821C }, /* GL_MINOR_VERSION */
+   { 27337, 0x00008007 }, /* GL_MIN_EXT */
+   { 27348, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+   { 27376, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 27395, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 27418, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 27441, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 27461, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 27481, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 27511, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 27539, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 27567, 0x00001700 }, /* GL_MODELVIEW */
+   { 27580, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 27598, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 27617, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 27636, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 27655, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 27674, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 27693, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 27712, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 27731, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 27750, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 27769, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 27788, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 27806, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 27825, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 27844, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 27863, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 27882, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 27901, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 27920, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 27939, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 27958, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 27977, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 27996, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 28014, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 28033, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 28052, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 28070, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 28088, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 28106, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 28124, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 28142, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 28160, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 28178, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 28198, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 28240, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 28267, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 28292, 0x00002100 }, /* GL_MODULATE */
+   { 28304, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 28324, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 28351, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 28376, 0x00000103 }, /* GL_MULT */
+   { 28384, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 28399, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 28419, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 28438, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 28457, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 28481, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 28504, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 28534, 0x00002A25 }, /* GL_N3F_V3F */
+   { 28545, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 28565, 0x0000150E }, /* GL_NAND */
+   { 28573, 0x00002600 }, /* GL_NEAREST */
+   { 28584, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 28615, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 28647, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 28672, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 28698, 0x00000200 }, /* GL_NEVER */
+   { 28707, 0x00001102 }, /* GL_NICEST */
+   { 28717, 0x00000000 }, /* GL_NONE */
+   { 28725, 0x00000000 }, /* GL_NONE_OES */
+   { 28737, 0x00001505 }, /* GL_NOOP */
+   { 28745, 0x00001508 }, /* GL_NOR */
+   { 28752, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 28765, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 28781, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 28812, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 28847, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 28871, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 28894, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 28915, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 28929, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 28947, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 28964, 0x00008511 }, /* GL_NORMAL_MAP_OES */
+   { 28982, 0x00000205 }, /* GL_NOTEQUAL */
+   { 28994, 0x00000000 }, /* GL_NO_ERROR */
+   { 29006, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
+   { 29035, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 29069, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 29107, 0x0000821D }, /* GL_NUM_EXTENSIONS */
+   { 29125, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+   { 29155, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 29189, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 29218, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 29250, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 29292, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 29322, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 29362, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 29393, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 29422, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 29450, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 29480, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 29497, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 29523, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 29539, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 29574, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 29596, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 29611, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 29630, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 29660, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 29681, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 29709, 0x00000001 }, /* GL_ONE */
+   { 29716, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 29744, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 29776, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 29804, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 29836, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 29859, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 29882, 0x000088FB }, /* GL_ONE_MINUS_SRC1_ALPHA */
+   { 29906, 0x000088FA }, /* GL_ONE_MINUS_SRC1_COLOR */
+   { 29930, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 29953, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 29976, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 29994, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 30016, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 30038, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 30054, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 30074, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 30094, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 30112, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 30134, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 30156, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 30172, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 30192, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 30212, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 30230, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 30252, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 30274, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 30290, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 30310, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 30330, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 30351, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 30370, 0x00001507 }, /* GL_OR */
+   { 30376, 0x00000A01 }, /* GL_ORDER */
+   { 30385, 0x0000150D }, /* GL_OR_INVERTED */
+   { 30400, 0x0000150B }, /* GL_OR_REVERSE */
+   { 30414, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 30431, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 30449, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 30470, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 30490, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 30508, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 30527, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 30547, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 30567, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 30585, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 30604, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 30629, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 30653, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 30674, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 30696, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 30718, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 30743, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 30767, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 30788, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 30810, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 30832, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 30854, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 30885, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 30905, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 30930, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 30950, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 30975, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 30995, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 31020, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 31040, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 31065, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 31085, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 31110, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 31130, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 31155, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 31175, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 31200, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 31220, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 31245, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 31265, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 31290, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 31310, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 31335, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 31353, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 31374, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 31403, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 31436, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 31461, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 31484, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 31515, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 31550, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 31577, 0x00001B00 }, /* GL_POINT */
+   { 31586, 0x00000000 }, /* GL_POINTS */
+   { 31596, 0x00000002 }, /* GL_POINT_BIT */
+   { 31609, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 31639, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 31673, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 31707, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 31742, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 31771, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 31804, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 31837, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 31871, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 31885, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 31924, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 31948, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 31980, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 32011, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 32040, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 32066, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 32084, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 32106, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 32128, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 32151, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 32169, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 32191, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 32213, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 32236, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 32256, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 32272, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 32293, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 32309, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 32329, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 32358, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 32377, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 32397, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 32423, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 32438, 0x00000009 }, /* GL_POLYGON */
+   { 32449, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 32464, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 32480, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 32503, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 32528, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 32551, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 32574, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 32598, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 32622, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 32640, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 32663, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 32682, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 32705, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 32722, 0x00001203 }, /* GL_POSITION */
+   { 32734, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 32766, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 32802, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 32835, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 32872, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 32903, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 32938, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 32970, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 33006, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 33039, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 33071, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 33107, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 33140, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 33177, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 33207, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 33241, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 33272, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 33307, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 33338, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 33373, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 33405, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 33441, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 33471, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 33505, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 33536, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 33571, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 33603, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 33634, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 33669, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 33701, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 33737, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 33766, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 33799, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 33829, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 33863, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 33902, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 33935, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 33975, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 34009, 0x00008578 }, /* GL_PREVIOUS */
+   { 34021, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 34037, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 34053, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 34070, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 34091, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 34112, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
+   { 34136, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 34164, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
+   { 34185, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
+   { 34212, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 34242, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 34266, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 34299, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 34331, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 34354, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
+   { 34380, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 34410, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
+   { 34435, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 34464, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+   { 34499, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 34522, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 34552, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 34581, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 34609, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 34631, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 34659, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 34687, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 34709, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 34730, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 34770, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 34809, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 34839, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 34874, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 34907, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 34941, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 34980, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 35019, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 35041, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 35067, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 35091, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
+   { 35113, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 35139, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 35162, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 35184, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 35205, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 35226, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 35253, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 35285, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 35317, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 35352, 0x00001701 }, /* GL_PROJECTION */
+   { 35366, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 35387, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 35430, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 35456, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 35476, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 35500, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 35521, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 35540, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 35563, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 35602, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 35640, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 35660, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
+   { 35686, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 35716, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 35740, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 35760, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
+   { 35786, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 35816, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 35840, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 35860, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 35893, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 35919, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 35949, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
+   { 35976, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 36007, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 36037, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 36056, 0x00002003 }, /* GL_Q */
+   { 36061, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 36086, 0x00000007 }, /* GL_QUADS */
+   { 36095, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 36139, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 36187, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 36204, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 36218, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
+   { 36245, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 36275, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
+   { 36299, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 36326, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 36348, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 36374, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
+   { 36391, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 36411, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 36427, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 36447, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 36473, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 36503, 0x00008E13 }, /* GL_QUERY_WAIT */
+   { 36517, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 36534, 0x00002002 }, /* GL_R */
+   { 36539, 0x00008C3A }, /* GL_R11F_G11F_B10F */
+   { 36557, 0x0000822A }, /* GL_R16 */
+   { 36564, 0x0000822D }, /* GL_R16F */
+   { 36572, 0x00008233 }, /* GL_R16I */
+   { 36580, 0x00008234 }, /* GL_R16UI */
+   { 36589, 0x00008F98 }, /* GL_R16_SNORM */
+   { 36602, 0x0000822E }, /* GL_R32F */
+   { 36610, 0x00008235 }, /* GL_R32I */
+   { 36618, 0x00008236 }, /* GL_R32UI */
+   { 36627, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 36639, 0x00008229 }, /* GL_R8 */
+   { 36645, 0x00008231 }, /* GL_R8I */
+   { 36652, 0x00008232 }, /* GL_R8UI */
+   { 36660, 0x00008F94 }, /* GL_R8_SNORM */
+   { 36672, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
+   { 36694, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 36720, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 36753, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 36768, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 36788, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 36816, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 36848, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 36872, 0x000088B8 }, /* GL_READ_ONLY */
+   { 36885, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 36902, 0x000088BA }, /* GL_READ_WRITE */
+   { 36916, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 36934, 0x00001903 }, /* GL_RED */
+   { 36941, 0x00008016 }, /* GL_REDUCE */
+   { 36951, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 36965, 0x00000D15 }, /* GL_RED_BIAS */
+   { 36977, 0x00000D52 }, /* GL_RED_BITS */
+   { 36989, 0x00008D94 }, /* GL_RED_INTEGER */
+   { 37004, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
+   { 37023, 0x00000D14 }, /* GL_RED_SCALE */
+   { 37036, 0x00008F90 }, /* GL_RED_SNORM */
+   { 37049, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 37067, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 37089, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 37110, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 37132, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 37150, 0x00001C00 }, /* GL_RENDER */
+   { 37160, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 37176, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 37203, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 37234, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 37258, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 37286, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 37314, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 37340, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 37370, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 37397, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 37428, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 37448, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 37475, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 37506, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 37529, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 37556, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 37583, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 37615, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 37651, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 37687, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 37707, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 37732, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 37761, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 37785, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 37813, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 37842, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 37875, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 37897, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 37923, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 37949, 0x00001F01 }, /* GL_RENDERER */
+   { 37961, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 37976, 0x00002901 }, /* GL_REPEAT */
+   { 37986, 0x00001E01 }, /* GL_REPLACE */
+   { 37997, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 38012, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 38035, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+   { 38071, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 38089, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 38111, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+   { 38146, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 38164, 0x00000102 }, /* GL_RETURN */
+   { 38174, 0x00008227 }, /* GL_RG */
+   { 38180, 0x0000822C }, /* GL_RG16 */
+   { 38188, 0x0000822F }, /* GL_RG16F */
+   { 38197, 0x00008239 }, /* GL_RG16I */
+   { 38206, 0x0000823A }, /* GL_RG16UI */
+   { 38216, 0x00008F99 }, /* GL_RG16_SNORM */
+   { 38230, 0x00008230 }, /* GL_RG32F */
+   { 38239, 0x0000823B }, /* GL_RG32I */
+   { 38248, 0x0000823C }, /* GL_RG32UI */
+   { 38258, 0x0000822B }, /* GL_RG8 */
+   { 38265, 0x00008237 }, /* GL_RG8I */
+   { 38273, 0x00008238 }, /* GL_RG8UI */
+   { 38282, 0x00008F95 }, /* GL_RG8_SNORM */
+   { 38295, 0x00001907 }, /* GL_RGB */
+   { 38302, 0x00008052 }, /* GL_RGB10 */
+   { 38311, 0x00008059 }, /* GL_RGB10_A2 */
+   { 38323, 0x0000906F }, /* GL_RGB10_A2UI */
+   { 38337, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 38353, 0x00008052 }, /* GL_RGB10_EXT */
+   { 38366, 0x00008053 }, /* GL_RGB12 */
+   { 38375, 0x00008053 }, /* GL_RGB12_EXT */
+   { 38388, 0x00008054 }, /* GL_RGB16 */
+   { 38397, 0x0000881B }, /* GL_RGB16F */
+   { 38407, 0x0000881B }, /* GL_RGB16F_ARB */
+   { 38421, 0x00008D89 }, /* GL_RGB16I */
+   { 38431, 0x00008D89 }, /* GL_RGB16I_EXT */
+   { 38445, 0x00008D77 }, /* GL_RGB16UI */
+   { 38456, 0x00008D77 }, /* GL_RGB16UI_EXT */
+   { 38471, 0x00008054 }, /* GL_RGB16_EXT */
+   { 38484, 0x00008F9A }, /* GL_RGB16_SNORM */
+   { 38499, 0x0000804E }, /* GL_RGB2_EXT */
+   { 38511, 0x00008815 }, /* GL_RGB32F */
+   { 38521, 0x00008815 }, /* GL_RGB32F_ARB */
+   { 38535, 0x00008D83 }, /* GL_RGB32I */
+   { 38545, 0x00008D83 }, /* GL_RGB32I_EXT */
+   { 38559, 0x00008D71 }, /* GL_RGB32UI */
+   { 38570, 0x00008D71 }, /* GL_RGB32UI_EXT */
+   { 38585, 0x0000804F }, /* GL_RGB4 */
+   { 38593, 0x0000804F }, /* GL_RGB4_EXT */
+   { 38605, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 38618, 0x00008050 }, /* GL_RGB5 */
+   { 38626, 0x00008D62 }, /* GL_RGB565 */
+   { 38636, 0x00008D62 }, /* GL_RGB565_OES */
+   { 38650, 0x00008057 }, /* GL_RGB5_A1 */
+   { 38661, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 38676, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 38691, 0x00008050 }, /* GL_RGB5_EXT */
+   { 38703, 0x00008051 }, /* GL_RGB8 */
+   { 38711, 0x00008D8F }, /* GL_RGB8I */
+   { 38720, 0x00008D8F }, /* GL_RGB8I_EXT */
+   { 38733, 0x00008D7D }, /* GL_RGB8UI */
+   { 38743, 0x00008D7D }, /* GL_RGB8UI_EXT */
+   { 38757, 0x00008051 }, /* GL_RGB8_EXT */
+   { 38769, 0x00008051 }, /* GL_RGB8_OES */
+   { 38781, 0x00008F96 }, /* GL_RGB8_SNORM */
+   { 38795, 0x00008C3D }, /* GL_RGB9_E5 */
+   { 38806, 0x00001908 }, /* GL_RGBA */
+   { 38814, 0x0000805A }, /* GL_RGBA12 */
+   { 38824, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 38838, 0x0000805B }, /* GL_RGBA16 */
+   { 38848, 0x0000881A }, /* GL_RGBA16F */
+   { 38859, 0x0000881A }, /* GL_RGBA16F_ARB */
+   { 38874, 0x00008D88 }, /* GL_RGBA16I */
+   { 38885, 0x00008D88 }, /* GL_RGBA16I_EXT */
+   { 38900, 0x00008D76 }, /* GL_RGBA16UI */
+   { 38912, 0x00008D76 }, /* GL_RGBA16UI_EXT */
+   { 38928, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 38942, 0x00008F9B }, /* GL_RGBA16_SNORM */
+   { 38958, 0x00008055 }, /* GL_RGBA2 */
+   { 38967, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 38980, 0x00008814 }, /* GL_RGBA32F */
+   { 38991, 0x00008814 }, /* GL_RGBA32F_ARB */
+   { 39006, 0x00008D82 }, /* GL_RGBA32I */
+   { 39017, 0x00008D82 }, /* GL_RGBA32I_EXT */
+   { 39032, 0x00008D70 }, /* GL_RGBA32UI */
+   { 39044, 0x00008D70 }, /* GL_RGBA32UI_EXT */
+   { 39060, 0x00008056 }, /* GL_RGBA4 */
+   { 39069, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 39088, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 39101, 0x00008056 }, /* GL_RGBA4_OES */
+   { 39114, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 39128, 0x00008058 }, /* GL_RGBA8 */
+   { 39137, 0x00008D8E }, /* GL_RGBA8I */
+   { 39147, 0x00008D8E }, /* GL_RGBA8I_EXT */
+   { 39161, 0x00008D7C }, /* GL_RGBA8UI */
+   { 39172, 0x00008D7C }, /* GL_RGBA8UI_EXT */
+   { 39187, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 39200, 0x00008058 }, /* GL_RGBA8_OES */
+   { 39213, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 39228, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 39246, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
+   { 39269, 0x00008D99 }, /* GL_RGBA_INTEGER */
+   { 39285, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
+   { 39305, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
+   { 39330, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 39343, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 39356, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 39370, 0x00008D98 }, /* GL_RGB_INTEGER */
+   { 39385, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
+   { 39404, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 39416, 0x00008573 }, /* GL_RGB_SCALE */
+   { 39429, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 39446, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 39463, 0x00008F92 }, /* GL_RGB_SNORM */
+   { 39476, 0x00008228 }, /* GL_RG_INTEGER */
+   { 39490, 0x00008F91 }, /* GL_RG_SNORM */
+   { 39502, 0x00000407 }, /* GL_RIGHT */
+   { 39511, 0x00002000 }, /* GL_S */
+   { 39516, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 39530, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
+   { 39550, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
+   { 39574, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+   { 39601, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
+   { 39632, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 39653, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 39667, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
+   { 39687, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
+   { 39711, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+   { 39738, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
+   { 39769, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
+   { 39788, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
+   { 39814, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 39835, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 39849, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 39867, 0x00008919 }, /* GL_SAMPLER_BINDING */
+   { 39886, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 39904, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 39926, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 39942, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 39965, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 39992, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
+   { 40016, 0x000080A9 }, /* GL_SAMPLES */
+   { 40027, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 40043, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 40058, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 40076, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 40098, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 40126, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 40158, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 40181, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 40208, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 40226, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 40249, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 40271, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 40290, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 40313, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 40339, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 40369, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 40394, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 40423, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 40438, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 40453, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 40469, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 40494, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 40534, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 40578, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 40611, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 40641, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 40673, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 40703, 0x00001C02 }, /* GL_SELECT */
+   { 40713, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 40741, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 40766, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 40782, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 40802, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 40826, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 40853, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 40884, 0x0000150F }, /* GL_SET */
+   { 40891, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 40916, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 40935, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 40956, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 40980, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 40995, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 41010, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 41038, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 41061, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 41091, 0x00001601 }, /* GL_SHININESS */
+   { 41104, 0x00001402 }, /* GL_SHORT */
+   { 41113, 0x00009119 }, /* GL_SIGNALED */
+   { 41125, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 41146, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 41162, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 41182, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 41201, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 41215, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 41230, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 41252, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 41272, 0x00001D01 }, /* GL_SMOOTH */
+   { 41282, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 41315, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 41342, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 41375, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 41402, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 41419, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 41440, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 41461, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 41476, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 41495, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 41514, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 41531, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 41552, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 41573, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 41588, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 41607, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 41626, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 41643, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 41664, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 41685, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 41700, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 41719, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 41738, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 41758, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 41776, 0x00001202 }, /* GL_SPECULAR */
+   { 41788, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 41802, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 41817, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 41835, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 41852, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 41866, 0x00008580 }, /* GL_SRC0_RGB */
+   { 41878, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 41892, 0x000088F9 }, /* GL_SRC1_COLOR */
+   { 41906, 0x00008581 }, /* GL_SRC1_RGB */
+   { 41918, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 41932, 0x00008582 }, /* GL_SRC2_RGB */
+   { 41944, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 41957, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 41979, 0x00000300 }, /* GL_SRC_COLOR */
+   { 41992, 0x00008C40 }, /* GL_SRGB */
+   { 42000, 0x00008C41 }, /* GL_SRGB8 */
+   { 42009, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 42025, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 42039, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 42057, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 42076, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 42091, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 42110, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 42125, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 42144, 0x000088E5 }, /* GL_STATIC_READ */
+   { 42159, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 42178, 0x00001802 }, /* GL_STENCIL */
+   { 42189, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 42211, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 42237, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 42263, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 42284, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 42309, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 42330, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 42355, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 42387, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 42423, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 42455, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 42491, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 42511, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 42538, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 42564, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 42580, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 42598, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 42620, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 42643, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 42659, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 42675, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 42692, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 42710, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 42729, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 42752, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 42774, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 42796, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 42814, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 42836, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 42858, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 42876, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 42898, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 42920, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 42941, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 42968, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 42995, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 43010, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 43026, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 43055, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 43077, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 43098, 0x00000C33 }, /* GL_STEREO */
+   { 43108, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 43132, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 43157, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 43181, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 43196, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 43215, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 43230, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 43249, 0x000088E1 }, /* GL_STREAM_READ */
+   { 43264, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 43283, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 43300, 0x000084E7 }, /* GL_SUBTRACT */
+   { 43312, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 43328, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 43346, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 43360, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 43374, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 43401, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 43431, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 43446, 0x00002001 }, /* GL_T */
+   { 43451, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 43466, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 43485, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 43501, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 43516, 0x00002A27 }, /* GL_T2F_V3F */
+   { 43527, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 43546, 0x00002A28 }, /* GL_T4F_V4F */
+   { 43557, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 43580, 0x00001702 }, /* GL_TEXTURE */
+   { 43591, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 43603, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 43619, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 43631, 0x000084CA }, /* GL_TEXTURE10 */
+   { 43644, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 43661, 0x000084CB }, /* GL_TEXTURE11 */
+   { 43674, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 43691, 0x000084CC }, /* GL_TEXTURE12 */
+   { 43704, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 43721, 0x000084CD }, /* GL_TEXTURE13 */
+   { 43734, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 43751, 0x000084CE }, /* GL_TEXTURE14 */
+   { 43764, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 43781, 0x000084CF }, /* GL_TEXTURE15 */
+   { 43794, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 43811, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 43824, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 43841, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 43854, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 43871, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 43884, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 43901, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 43914, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 43931, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 43947, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 43959, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 43972, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 43989, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 44002, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 44019, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 44032, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 44049, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 44062, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 44079, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 44092, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 44109, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 44122, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 44139, 0x000084DA }, /* GL_TEXTURE26 */
+   { 44152, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 44169, 0x000084DB }, /* GL_TEXTURE27 */
+   { 44182, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 44199, 0x000084DC }, /* GL_TEXTURE28 */
+   { 44212, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 44229, 0x000084DD }, /* GL_TEXTURE29 */
+   { 44242, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 44259, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 44275, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 44287, 0x000084DE }, /* GL_TEXTURE30 */
+   { 44300, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 44317, 0x000084DF }, /* GL_TEXTURE31 */
+   { 44330, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 44347, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 44363, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 44375, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 44391, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 44403, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 44419, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 44431, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 44447, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 44459, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 44475, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 44487, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 44503, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 44515, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 44531, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 44545, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 44565, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 44589, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 44603, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 44623, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 44647, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 44661, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 44679, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 44701, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 44727, 0x00008C13 }, /* GL_TEXTURE_ALPHA_TYPE */
+   { 44749, 0x00008C13 }, /* GL_TEXTURE_ALPHA_TYPE_ARB */
+   { 44775, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 44797, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 44819, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 44847, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 44879, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 44901, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 44929, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 44961, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 44983, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 45009, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 45035, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 45065, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 45093, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 45125, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 45157, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+   { 45189, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 45218, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 45251, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 45283, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 45298, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 45319, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 45344, 0x00008C12 }, /* GL_TEXTURE_BLUE_TYPE */
+   { 45365, 0x00008C12 }, /* GL_TEXTURE_BLUE_TYPE_ARB */
+   { 45390, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 45408, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 45432, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 45450, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 45472, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 45509, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 45550, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 45575, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 45604, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 45635, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 45665, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 45695, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 45730, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 45761, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 45799, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 45826, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 45858, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 45892, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 45916, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 45944, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 45968, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 45996, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 46029, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 46053, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 46075, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 46097, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 46123, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 46157, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 46190, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 46227, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 46255, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 46287, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 46310, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 46348, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 46390, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 46421, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 46449, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 46479, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 46507, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 46532, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 46552, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 46576, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 46607, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 46642, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 46677, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 46708, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 46743, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 46778, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 46809, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 46844, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 46879, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 46903, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 46934, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 46969, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 47004, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 47035, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 47070, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 47105, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 47136, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 47171, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 47206, 0x0000884F }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 47235, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 47252, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 47274, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 47300, 0x00008C16 }, /* GL_TEXTURE_DEPTH_TYPE */
+   { 47322, 0x00008C16 }, /* GL_TEXTURE_DEPTH_TYPE_ARB */
+   { 47348, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 47363, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 47384, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 47404, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
+   { 47428, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 47454, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 47484, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 47504, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 47528, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 47545, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 47562, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 47579, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 47602, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 47619, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 47644, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 47666, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 47692, 0x00008C11 }, /* GL_TEXTURE_GREEN_TYPE */
+   { 47714, 0x00008C11 }, /* GL_TEXTURE_GREEN_TYPE_ARB */
+   { 47740, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 47758, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 47784, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 47810, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 47840, 0x00008C15 }, /* GL_TEXTURE_INTENSITY_TYPE */
+   { 47866, 0x00008C15 }, /* GL_TEXTURE_INTENSITY_TYPE_ARB */
+   { 47896, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 47923, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 47948, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 47968, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 47992, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 48019, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 48046, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 48073, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 48099, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 48129, 0x00008C14 }, /* GL_TEXTURE_LUMINANCE_TYPE */
+   { 48155, 0x00008C14 }, /* GL_TEXTURE_LUMINANCE_TYPE_ARB */
+   { 48185, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 48207, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 48225, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 48265, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 48295, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 48323, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 48351, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 48379, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 48400, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 48419, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 48441, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 48460, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 48480, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 48510, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 48541, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 48562, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 48587, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 48611, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 48631, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 48655, 0x00008C10 }, /* GL_TEXTURE_RED_TYPE */
+   { 48675, 0x00008C10 }, /* GL_TEXTURE_RED_TYPE_ARB */
+   { 48699, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 48719, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 48742, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 48765, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 48789, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 48817, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 48847, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 48872, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 48906, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 48923, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 48941, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 48963, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 48981, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 48999, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 49018, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 49038, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 49057, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 49086, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 49103, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 49125, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 49155, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 49184, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 49220, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 49257, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 49298, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 49331, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 49365, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 49403, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 49439, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 49473, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 49511, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 49546, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 49585, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 49626, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 49671, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 49702, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 49737, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 49778, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 49823, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 49849, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 49879, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 49911, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 49941, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 49975, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 49991, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 50022, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 50057, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 50085, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 50117, 0x00000004 }, /* GL_TRIANGLES */
+   { 50130, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 50153, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 50180, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 50196, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 50217, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 50235, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 50263, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 50295, 0x00000001 }, /* GL_TRUE */
+   { 50303, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 50322, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+   { 50351, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 50371, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 50394, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 50414, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 50435, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 50457, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 50479, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 50499, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 50520, 0x00009118 }, /* GL_UNSIGNALED */
+   { 50534, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 50551, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 50578, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 50601, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 50617, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 50649, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 50676, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 50707, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 50728, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 50753, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 50777, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 50802, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 50833, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 50868, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 50896, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 50920, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 50948, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 50975, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 51008, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 51045, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 51076, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 51103, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 51136, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 51173, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 51204, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 51236, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 51272, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 51299, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 51330, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 51361, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 51396, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 51425, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 51458, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 51479, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 51504, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 51525, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 51550, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 51571, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 51596, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 51619, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED_ARB */
+   { 51646, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 51664, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 51694, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 51728, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 51754, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 51784, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 51818, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 51844, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 51868, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 51896, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 51924, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 51951, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 51983, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 52014, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 52028, 0x00002A20 }, /* GL_V2F */
+   { 52035, 0x00002A21 }, /* GL_V3F */
+   { 52042, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 52061, 0x00001F00 }, /* GL_VENDOR */
+   { 52071, 0x00001F02 }, /* GL_VERSION */
+   { 52082, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 52098, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 52122, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 52152, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 52183, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 52218, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 52242, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 52263, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 52286, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 52307, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 52334, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 52362, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 52390, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 52418, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 52446, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 52474, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 52502, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 52529, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 52556, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 52583, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 52610, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 52637, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 52664, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 52691, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 52718, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 52745, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 52783, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 52825, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 52860, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 52891, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 52926, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 52957, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 52992, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 53026, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 53064, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 53095, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 53130, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 53158, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 53190, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 53220, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 53254, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 53282, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 53314, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 53334, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 53356, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 53385, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 53406, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 53435, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 53468, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 53500, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 53527, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 53558, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 53588, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 53605, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 53626, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 53653, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 53665, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 53681, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 53699, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 53714, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 53734, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 53765, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 53800, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 53835, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 53855, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 53883, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 53911, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 53936, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 53961, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 53988, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 54015, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 54040, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 54065, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 54089, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 54108, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 54122, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 54140, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 54158, 0x00001506 }, /* GL_XOR */
+   { 54165, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 54184, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 54198, 0x00000000 }, /* GL_ZERO */
+   { 54206, 0x00000D16 }, /* GL_ZOOM_X */
+   { 54216, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1594] =
+static const unsigned reduced_enums[1642] =
 {
-       576, /* GL_FALSE */
-       873, /* GL_LINES */
-       877, /* GL_LINE_LOOP */
-       884, /* GL_LINE_STRIP */
-      2201, /* GL_TRIANGLES */
-      2206, /* GL_TRIANGLE_STRIP */
-      2204, /* GL_TRIANGLE_FAN */
-      1561, /* GL_QUADS */
-      1565, /* GL_QUAD_STRIP */
-      1429, /* GL_POLYGON */
-       874, /* GL_LINES_ADJACENCY */
-       885, /* GL_LINE_STRIP_ADJACENCY */
-      2202, /* GL_TRIANGLES_ADJACENCY */
-      2207, /* GL_TRIANGLE_STRIP_ADJACENCY */
-      1441, /* GL_POLYGON_STIPPLE_BIT */
-      1384, /* GL_PIXEL_MODE_BIT */
-       860, /* GL_LIGHTING_BIT */
-       610, /* GL_FOG_BIT */
+       584, /* GL_FALSE */
+       884, /* GL_LINES */
+       888, /* GL_LINE_LOOP */
+       895, /* GL_LINE_STRIP */
+      2260, /* GL_TRIANGLES */
+      2265, /* GL_TRIANGLE_STRIP */
+      2263, /* GL_TRIANGLE_FAN */
+      1579, /* GL_QUADS */
+      1583, /* GL_QUAD_STRIP */
+      1447, /* GL_POLYGON */
+       885, /* GL_LINES_ADJACENCY */
+       896, /* GL_LINE_STRIP_ADJACENCY */
+      2261, /* GL_TRIANGLES_ADJACENCY */
+      2266, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      1459, /* GL_POLYGON_STIPPLE_BIT */
+      1402, /* GL_PIXEL_MODE_BIT */
+       871, /* GL_LIGHTING_BIT */
+       619, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       896, /* GL_LOAD */
-      1652, /* GL_RETURN */
-      1249, /* GL_MULT */
+       907, /* GL_LOAD */
+      1680, /* GL_RETURN */
+      1265, /* GL_MULT */
         24, /* GL_ADD */
-      1265, /* GL_NEVER */
-       850, /* GL_LESS */
-       565, /* GL_EQUAL */
-       849, /* GL_LEQUAL */
-       734, /* GL_GREATER */
-      1282, /* GL_NOTEQUAL */
-       732, /* GL_GEQUAL */
-        55, /* GL_ALWAYS */
-      1863, /* GL_SRC_COLOR */
-      1317, /* GL_ONE_MINUS_SRC_COLOR */
-      1861, /* GL_SRC_ALPHA */
-      1316, /* GL_ONE_MINUS_SRC_ALPHA */
-       544, /* GL_DST_ALPHA */
-      1314, /* GL_ONE_MINUS_DST_ALPHA */
-       545, /* GL_DST_COLOR */
-      1315, /* GL_ONE_MINUS_DST_COLOR */
-      1862, /* GL_SRC_ALPHA_SATURATE */
-       709, /* GL_FRONT_LEFT */
-       710, /* GL_FRONT_RIGHT */
-        77, /* GL_BACK_LEFT */
-        78, /* GL_BACK_RIGHT */
-       706, /* GL_FRONT */
-        76, /* GL_BACK */
-       848, /* GL_LEFT */
-      1743, /* GL_RIGHT */
-       707, /* GL_FRONT_AND_BACK */
-        71, /* GL_AUX0 */
-        72, /* GL_AUX1 */
-        73, /* GL_AUX2 */
-        74, /* GL_AUX3 */
-       836, /* GL_INVALID_ENUM */
-       841, /* GL_INVALID_VALUE */
-       840, /* GL_INVALID_OPERATION */
-      1868, /* GL_STACK_OVERFLOW */
-      1869, /* GL_STACK_UNDERFLOW */
-      1342, /* GL_OUT_OF_MEMORY */
-       837, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+      1281, /* GL_NEVER */
+       861, /* GL_LESS */
+       573, /* GL_EQUAL */
+       860, /* GL_LEQUAL */
+       743, /* GL_GREATER */
+      1298, /* GL_NOTEQUAL */
+       741, /* GL_GEQUAL */
+        57, /* GL_ALWAYS */
+      1908, /* GL_SRC_COLOR */
+      1335, /* GL_ONE_MINUS_SRC_COLOR */
+      1906, /* GL_SRC_ALPHA */
+      1334, /* GL_ONE_MINUS_SRC_ALPHA */
+       552, /* GL_DST_ALPHA */
+      1330, /* GL_ONE_MINUS_DST_ALPHA */
+       553, /* GL_DST_COLOR */
+      1331, /* GL_ONE_MINUS_DST_COLOR */
+      1907, /* GL_SRC_ALPHA_SATURATE */
+       718, /* GL_FRONT_LEFT */
+       719, /* GL_FRONT_RIGHT */
+        79, /* GL_BACK_LEFT */
+        80, /* GL_BACK_RIGHT */
+       715, /* GL_FRONT */
+        78, /* GL_BACK */
+       859, /* GL_LEFT */
+      1787, /* GL_RIGHT */
+       716, /* GL_FRONT_AND_BACK */
+        73, /* GL_AUX0 */
+        74, /* GL_AUX1 */
+        75, /* GL_AUX2 */
+        76, /* GL_AUX3 */
+       847, /* GL_INVALID_ENUM */
+       852, /* GL_INVALID_VALUE */
+       851, /* GL_INVALID_OPERATION */
+      1913, /* GL_STACK_OVERFLOW */
+      1914, /* GL_STACK_UNDERFLOW */
+      1360, /* GL_OUT_OF_MEMORY */
+       848, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1362, /* GL_PASS_THROUGH_TOKEN */
-      1428, /* GL_POINT_TOKEN */
-       887, /* GL_LINE_TOKEN */
-      1442, /* GL_POLYGON_TOKEN */
-        87, /* GL_BITMAP_TOKEN */
-       543, /* GL_DRAW_PIXEL_TOKEN */
-       353, /* GL_COPY_PIXEL_TOKEN */
-       878, /* GL_LINE_RESET_TOKEN */
-       569, /* GL_EXP */
-       570, /* GL_EXP2 */
-       390, /* GL_CW */
-       154, /* GL_CCW */
-       187, /* GL_COEFF */
-      1339, /* GL_ORDER */
-       464, /* GL_DOMAIN */
-       363, /* GL_CURRENT_COLOR */
-       366, /* GL_CURRENT_INDEX */
-       372, /* GL_CURRENT_NORMAL */
-       386, /* GL_CURRENT_TEXTURE_COORDS */
-       378, /* GL_CURRENT_RASTER_COLOR */
-       380, /* GL_CURRENT_RASTER_INDEX */
-       384, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       381, /* GL_CURRENT_RASTER_POSITION */
-       382, /* GL_CURRENT_RASTER_POSITION_VALID */
-       379, /* GL_CURRENT_RASTER_DISTANCE */
-      1420, /* GL_POINT_SMOOTH */
-      1404, /* GL_POINT_SIZE */
-      1419, /* GL_POINT_SIZE_RANGE */
-      1410, /* GL_POINT_SIZE_GRANULARITY */
-       879, /* GL_LINE_SMOOTH */
-       888, /* GL_LINE_WIDTH */
-       890, /* GL_LINE_WIDTH_RANGE */
-       889, /* GL_LINE_WIDTH_GRANULARITY */
-       881, /* GL_LINE_STIPPLE */
-       882, /* GL_LINE_STIPPLE_PATTERN */
-       883, /* GL_LINE_STIPPLE_REPEAT */
-       895, /* GL_LIST_MODE */
-      1106, /* GL_MAX_LIST_NESTING */
-       892, /* GL_LIST_BASE */
-       894, /* GL_LIST_INDEX */
-      1431, /* GL_POLYGON_MODE */
-      1438, /* GL_POLYGON_SMOOTH */
-      1440, /* GL_POLYGON_STIPPLE */
-       554, /* GL_EDGE_FLAG */
-       356, /* GL_CULL_FACE */
-       357, /* GL_CULL_FACE_MODE */
-       708, /* GL_FRONT_FACE */
-       859, /* GL_LIGHTING */
-       864, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       865, /* GL_LIGHT_MODEL_TWO_SIDE */
-       861, /* GL_LIGHT_MODEL_AMBIENT */
-      1810, /* GL_SHADE_MODEL */
-       235, /* GL_COLOR_MATERIAL_FACE */
-       236, /* GL_COLOR_MATERIAL_PARAMETER */
-       234, /* GL_COLOR_MATERIAL */
-       609, /* GL_FOG */
-       631, /* GL_FOG_INDEX */
-       627, /* GL_FOG_DENSITY */
-       635, /* GL_FOG_START */
-       629, /* GL_FOG_END */
-       632, /* GL_FOG_MODE */
-       611, /* GL_FOG_COLOR */
-       449, /* GL_DEPTH_RANGE */
-       458, /* GL_DEPTH_TEST */
-       461, /* GL_DEPTH_WRITEMASK */
-       434, /* GL_DEPTH_CLEAR_VALUE */
-       448, /* GL_DEPTH_FUNC */
+      1380, /* GL_PASS_THROUGH_TOKEN */
+      1446, /* GL_POINT_TOKEN */
+       898, /* GL_LINE_TOKEN */
+      1460, /* GL_POLYGON_TOKEN */
+        89, /* GL_BITMAP_TOKEN */
+       551, /* GL_DRAW_PIXEL_TOKEN */
+       359, /* GL_COPY_PIXEL_TOKEN */
+       889, /* GL_LINE_RESET_TOKEN */
+       577, /* GL_EXP */
+       578, /* GL_EXP2 */
+       396, /* GL_CW */
+       156, /* GL_CCW */
+       189, /* GL_COEFF */
+      1357, /* GL_ORDER */
+       472, /* GL_DOMAIN */
+       369, /* GL_CURRENT_COLOR */
+       372, /* GL_CURRENT_INDEX */
+       378, /* GL_CURRENT_NORMAL */
+       392, /* GL_CURRENT_TEXTURE_COORDS */
+       384, /* GL_CURRENT_RASTER_COLOR */
+       386, /* GL_CURRENT_RASTER_INDEX */
+       390, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       387, /* GL_CURRENT_RASTER_POSITION */
+       388, /* GL_CURRENT_RASTER_POSITION_VALID */
+       385, /* GL_CURRENT_RASTER_DISTANCE */
+      1438, /* GL_POINT_SMOOTH */
+      1422, /* GL_POINT_SIZE */
+      1437, /* GL_POINT_SIZE_RANGE */
+      1428, /* GL_POINT_SIZE_GRANULARITY */
+       890, /* GL_LINE_SMOOTH */
+       899, /* GL_LINE_WIDTH */
+       901, /* GL_LINE_WIDTH_RANGE */
+       900, /* GL_LINE_WIDTH_GRANULARITY */
+       892, /* GL_LINE_STIPPLE */
+       893, /* GL_LINE_STIPPLE_PATTERN */
+       894, /* GL_LINE_STIPPLE_REPEAT */
+       906, /* GL_LIST_MODE */
+      1122, /* GL_MAX_LIST_NESTING */
+       903, /* GL_LIST_BASE */
+       905, /* GL_LIST_INDEX */
+      1449, /* GL_POLYGON_MODE */
+      1456, /* GL_POLYGON_SMOOTH */
+      1458, /* GL_POLYGON_STIPPLE */
+       562, /* GL_EDGE_FLAG */
+       362, /* GL_CULL_FACE */
+       363, /* GL_CULL_FACE_MODE */
+       717, /* GL_FRONT_FACE */
+       870, /* GL_LIGHTING */
+       875, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       876, /* GL_LIGHT_MODEL_TWO_SIDE */
+       872, /* GL_LIGHT_MODEL_AMBIENT */
+      1854, /* GL_SHADE_MODEL */
+       237, /* GL_COLOR_MATERIAL_FACE */
+       238, /* GL_COLOR_MATERIAL_PARAMETER */
+       236, /* GL_COLOR_MATERIAL */
+       618, /* GL_FOG */
+       640, /* GL_FOG_INDEX */
+       636, /* GL_FOG_DENSITY */
+       644, /* GL_FOG_START */
+       638, /* GL_FOG_END */
+       641, /* GL_FOG_MODE */
+       620, /* GL_FOG_COLOR */
+       457, /* GL_DEPTH_RANGE */
+       466, /* GL_DEPTH_TEST */
+       469, /* GL_DEPTH_WRITEMASK */
+       441, /* GL_DEPTH_CLEAR_VALUE */
+       456, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1913, /* GL_STENCIL_TEST */
-      1894, /* GL_STENCIL_CLEAR_VALUE */
-      1896, /* GL_STENCIL_FUNC */
-      1915, /* GL_STENCIL_VALUE_MASK */
-      1895, /* GL_STENCIL_FAIL */
-      1910, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1911, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1912, /* GL_STENCIL_REF */
-      1916, /* GL_STENCIL_WRITEMASK */
-      1053, /* GL_MATRIX_MODE */
-      1271, /* GL_NORMALIZE */
-      2334, /* GL_VIEWPORT */
-      1244, /* GL_MODELVIEW_STACK_DEPTH */
-      1535, /* GL_PROJECTION_STACK_DEPTH */
-      2155, /* GL_TEXTURE_STACK_DEPTH */
-      1241, /* GL_MODELVIEW_MATRIX */
-      1533, /* GL_PROJECTION_MATRIX */
-      2135, /* GL_TEXTURE_MATRIX */
-        69, /* GL_ATTRIB_STACK_DEPTH */
-       169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-        51, /* GL_ALPHA_TEST */
-        52, /* GL_ALPHA_TEST_FUNC */
-        53, /* GL_ALPHA_TEST_REF */
-       463, /* GL_DITHER */
-        91, /* GL_BLEND_DST */
-       105, /* GL_BLEND_SRC */
-        88, /* GL_BLEND */
-       898, /* GL_LOGIC_OP_MODE */
-       783, /* GL_INDEX_LOGIC_OP */
-       233, /* GL_COLOR_LOGIC_OP */
-        75, /* GL_AUX_BUFFERS */
-       474, /* GL_DRAW_BUFFER */
-      1588, /* GL_READ_BUFFER */
-      1787, /* GL_SCISSOR_BOX */
-      1788, /* GL_SCISSOR_TEST */
-       782, /* GL_INDEX_CLEAR_VALUE */
-       787, /* GL_INDEX_WRITEMASK */
-       230, /* GL_COLOR_CLEAR_VALUE */
-       272, /* GL_COLOR_WRITEMASK */
-       784, /* GL_INDEX_MODE */
-      1732, /* GL_RGBA_MODE */
-       473, /* GL_DOUBLEBUFFER */
-      1917, /* GL_STEREO */
-      1642, /* GL_RENDER_MODE */
-      1363, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1421, /* GL_POINT_SMOOTH_HINT */
-       880, /* GL_LINE_SMOOTH_HINT */
-      1439, /* GL_POLYGON_SMOOTH_HINT */
-       630, /* GL_FOG_HINT */
-      2115, /* GL_TEXTURE_GEN_S */
-      2117, /* GL_TEXTURE_GEN_T */
-      2114, /* GL_TEXTURE_GEN_R */
-      2113, /* GL_TEXTURE_GEN_Q */
-      1376, /* GL_PIXEL_MAP_I_TO_I */
-      1382, /* GL_PIXEL_MAP_S_TO_S */
-      1378, /* GL_PIXEL_MAP_I_TO_R */
-      1374, /* GL_PIXEL_MAP_I_TO_G */
-      1372, /* GL_PIXEL_MAP_I_TO_B */
-      1370, /* GL_PIXEL_MAP_I_TO_A */
-      1380, /* GL_PIXEL_MAP_R_TO_R */
-      1368, /* GL_PIXEL_MAP_G_TO_G */
-      1366, /* GL_PIXEL_MAP_B_TO_B */
-      1364, /* GL_PIXEL_MAP_A_TO_A */
-      1377, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1383, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1379, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1375, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1373, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1371, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1381, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1369, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1367, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1365, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2219, /* GL_UNPACK_SWAP_BYTES */
-      2214, /* GL_UNPACK_LSB_FIRST */
-      2215, /* GL_UNPACK_ROW_LENGTH */
-      2218, /* GL_UNPACK_SKIP_ROWS */
-      2217, /* GL_UNPACK_SKIP_PIXELS */
-      2212, /* GL_UNPACK_ALIGNMENT */
-      1351, /* GL_PACK_SWAP_BYTES */
-      1346, /* GL_PACK_LSB_FIRST */
-      1347, /* GL_PACK_ROW_LENGTH */
-      1350, /* GL_PACK_SKIP_ROWS */
-      1349, /* GL_PACK_SKIP_PIXELS */
-      1343, /* GL_PACK_ALIGNMENT */
-       994, /* GL_MAP_COLOR */
-       999, /* GL_MAP_STENCIL */
-       786, /* GL_INDEX_SHIFT */
-       785, /* GL_INDEX_OFFSET */
-      1604, /* GL_RED_SCALE */
-      1600, /* GL_RED_BIAS */
-      2360, /* GL_ZOOM_X */
-      2361, /* GL_ZOOM_Y */
-       740, /* GL_GREEN_SCALE */
-       736, /* GL_GREEN_BIAS */
-       115, /* GL_BLUE_SCALE */
-       111, /* GL_BLUE_BIAS */
-        50, /* GL_ALPHA_SCALE */
-        47, /* GL_ALPHA_BIAS */
-       450, /* GL_DEPTH_SCALE */
-       426, /* GL_DEPTH_BIAS */
-      1088, /* GL_MAX_EVAL_ORDER */
-      1105, /* GL_MAX_LIGHTS */
-      1065, /* GL_MAX_CLIP_DISTANCES */
-      1160, /* GL_MAX_TEXTURE_SIZE */
-      1112, /* GL_MAX_PIXEL_MAP_TABLE */
-      1061, /* GL_MAX_ATTRIB_STACK_DEPTH */
-      1108, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-      1109, /* GL_MAX_NAME_STACK_DEPTH */
-      1139, /* GL_MAX_PROJECTION_STACK_DEPTH */
-      1161, /* GL_MAX_TEXTURE_STACK_DEPTH */
-      1187, /* GL_MAX_VIEWPORT_DIMS */
-      1062, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1927, /* GL_SUBPIXEL_BITS */
-       781, /* GL_INDEX_BITS */
-      1601, /* GL_RED_BITS */
-       737, /* GL_GREEN_BITS */
-       112, /* GL_BLUE_BITS */
-        48, /* GL_ALPHA_BITS */
-       427, /* GL_DEPTH_BITS */
-      1891, /* GL_STENCIL_BITS */
+      1958, /* GL_STENCIL_TEST */
+      1939, /* GL_STENCIL_CLEAR_VALUE */
+      1941, /* GL_STENCIL_FUNC */
+      1960, /* GL_STENCIL_VALUE_MASK */
+      1940, /* GL_STENCIL_FAIL */
+      1955, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1956, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1957, /* GL_STENCIL_REF */
+      1961, /* GL_STENCIL_WRITEMASK */
+      1068, /* GL_MATRIX_MODE */
+      1287, /* GL_NORMALIZE */
+      2394, /* GL_VIEWPORT */
+      1260, /* GL_MODELVIEW_STACK_DEPTH */
+      1553, /* GL_PROJECTION_STACK_DEPTH */
+      2214, /* GL_TEXTURE_STACK_DEPTH */
+      1257, /* GL_MODELVIEW_MATRIX */
+      1551, /* GL_PROJECTION_MATRIX */
+      2192, /* GL_TEXTURE_MATRIX */
+        71, /* GL_ATTRIB_STACK_DEPTH */
+       171, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+        53, /* GL_ALPHA_TEST */
+        54, /* GL_ALPHA_TEST_FUNC */
+        55, /* GL_ALPHA_TEST_REF */
+       471, /* GL_DITHER */
+        93, /* GL_BLEND_DST */
+       107, /* GL_BLEND_SRC */
+        90, /* GL_BLEND */
+       909, /* GL_LOGIC_OP_MODE */
+       792, /* GL_INDEX_LOGIC_OP */
+       235, /* GL_COLOR_LOGIC_OP */
+        77, /* GL_AUX_BUFFERS */
+       482, /* GL_DRAW_BUFFER */
+      1616, /* GL_READ_BUFFER */
+      1831, /* GL_SCISSOR_BOX */
+      1832, /* GL_SCISSOR_TEST */
+       791, /* GL_INDEX_CLEAR_VALUE */
+       796, /* GL_INDEX_WRITEMASK */
+       232, /* GL_COLOR_CLEAR_VALUE */
+       274, /* GL_COLOR_WRITEMASK */
+       793, /* GL_INDEX_MODE */
+      1775, /* GL_RGBA_MODE */
+       481, /* GL_DOUBLEBUFFER */
+      1962, /* GL_STEREO */
+      1670, /* GL_RENDER_MODE */
+      1381, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1439, /* GL_POINT_SMOOTH_HINT */
+       891, /* GL_LINE_SMOOTH_HINT */
+      1457, /* GL_POLYGON_SMOOTH_HINT */
+       639, /* GL_FOG_HINT */
+      2166, /* GL_TEXTURE_GEN_S */
+      2168, /* GL_TEXTURE_GEN_T */
+      2165, /* GL_TEXTURE_GEN_R */
+      2164, /* GL_TEXTURE_GEN_Q */
+      1394, /* GL_PIXEL_MAP_I_TO_I */
+      1400, /* GL_PIXEL_MAP_S_TO_S */
+      1396, /* GL_PIXEL_MAP_I_TO_R */
+      1392, /* GL_PIXEL_MAP_I_TO_G */
+      1390, /* GL_PIXEL_MAP_I_TO_B */
+      1388, /* GL_PIXEL_MAP_I_TO_A */
+      1398, /* GL_PIXEL_MAP_R_TO_R */
+      1386, /* GL_PIXEL_MAP_G_TO_G */
+      1384, /* GL_PIXEL_MAP_B_TO_B */
+      1382, /* GL_PIXEL_MAP_A_TO_A */
+      1395, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1401, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1397, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1393, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1391, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1389, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1399, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1387, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1385, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1383, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      2278, /* GL_UNPACK_SWAP_BYTES */
+      2273, /* GL_UNPACK_LSB_FIRST */
+      2274, /* GL_UNPACK_ROW_LENGTH */
+      2277, /* GL_UNPACK_SKIP_ROWS */
+      2276, /* GL_UNPACK_SKIP_PIXELS */
+      2271, /* GL_UNPACK_ALIGNMENT */
+      1369, /* GL_PACK_SWAP_BYTES */
+      1364, /* GL_PACK_LSB_FIRST */
+      1365, /* GL_PACK_ROW_LENGTH */
+      1368, /* GL_PACK_SKIP_ROWS */
+      1367, /* GL_PACK_SKIP_PIXELS */
+      1361, /* GL_PACK_ALIGNMENT */
+      1009, /* GL_MAP_COLOR */
+      1014, /* GL_MAP_STENCIL */
+       795, /* GL_INDEX_SHIFT */
+       794, /* GL_INDEX_OFFSET */
+      1632, /* GL_RED_SCALE */
+      1628, /* GL_RED_BIAS */
+      2420, /* GL_ZOOM_X */
+      2421, /* GL_ZOOM_Y */
+       749, /* GL_GREEN_SCALE */
+       745, /* GL_GREEN_BIAS */
+       117, /* GL_BLUE_SCALE */
+       113, /* GL_BLUE_BIAS */
+        52, /* GL_ALPHA_SCALE */
+        49, /* GL_ALPHA_BIAS */
+       458, /* GL_DEPTH_SCALE */
+       433, /* GL_DEPTH_BIAS */
+      1104, /* GL_MAX_EVAL_ORDER */
+      1121, /* GL_MAX_LIGHTS */
+      1080, /* GL_MAX_CLIP_DISTANCES */
+      1176, /* GL_MAX_TEXTURE_SIZE */
+      1128, /* GL_MAX_PIXEL_MAP_TABLE */
+      1076, /* GL_MAX_ATTRIB_STACK_DEPTH */
+      1124, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+      1125, /* GL_MAX_NAME_STACK_DEPTH */
+      1155, /* GL_MAX_PROJECTION_STACK_DEPTH */
+      1177, /* GL_MAX_TEXTURE_STACK_DEPTH */
+      1203, /* GL_MAX_VIEWPORT_DIMS */
+      1077, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1972, /* GL_SUBPIXEL_BITS */
+       790, /* GL_INDEX_BITS */
+      1629, /* GL_RED_BITS */
+       746, /* GL_GREEN_BITS */
+       114, /* GL_BLUE_BITS */
+        50, /* GL_ALPHA_BITS */
+       434, /* GL_DEPTH_BITS */
+      1936, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1258, /* GL_NAME_STACK_DEPTH */
-        70, /* GL_AUTO_NORMAL */
-       940, /* GL_MAP1_COLOR_4 */
-       943, /* GL_MAP1_INDEX */
-       944, /* GL_MAP1_NORMAL */
-       945, /* GL_MAP1_TEXTURE_COORD_1 */
-       946, /* GL_MAP1_TEXTURE_COORD_2 */
-       947, /* GL_MAP1_TEXTURE_COORD_3 */
-       948, /* GL_MAP1_TEXTURE_COORD_4 */
-       949, /* GL_MAP1_VERTEX_3 */
-       950, /* GL_MAP1_VERTEX_4 */
-       967, /* GL_MAP2_COLOR_4 */
-       970, /* GL_MAP2_INDEX */
-       971, /* GL_MAP2_NORMAL */
-       972, /* GL_MAP2_TEXTURE_COORD_1 */
-       973, /* GL_MAP2_TEXTURE_COORD_2 */
-       974, /* GL_MAP2_TEXTURE_COORD_3 */
-       975, /* GL_MAP2_TEXTURE_COORD_4 */
-       976, /* GL_MAP2_VERTEX_3 */
-       977, /* GL_MAP2_VERTEX_4 */
-       941, /* GL_MAP1_GRID_DOMAIN */
-       942, /* GL_MAP1_GRID_SEGMENTS */
-       968, /* GL_MAP2_GRID_DOMAIN */
-       969, /* GL_MAP2_GRID_SEGMENTS */
-      2010, /* GL_TEXTURE_1D */
-      2013, /* GL_TEXTURE_2D */
-       579, /* GL_FEEDBACK_BUFFER_POINTER */
-       580, /* GL_FEEDBACK_BUFFER_SIZE */
-       581, /* GL_FEEDBACK_BUFFER_TYPE */
-      1797, /* GL_SELECTION_BUFFER_POINTER */
-      1798, /* GL_SELECTION_BUFFER_SIZE */
-      2161, /* GL_TEXTURE_WIDTH */
-      2121, /* GL_TEXTURE_HEIGHT */
-      2064, /* GL_TEXTURE_COMPONENTS */
-      2042, /* GL_TEXTURE_BORDER_COLOR */
-      2041, /* GL_TEXTURE_BORDER */
-       465, /* GL_DONT_CARE */
-       577, /* GL_FASTEST */
-      1266, /* GL_NICEST */
-        56, /* GL_AMBIENT */
-       462, /* GL_DIFFUSE */
-      1850, /* GL_SPECULAR */
-      1443, /* GL_POSITION */
-      1853, /* GL_SPOT_DIRECTION */
-      1854, /* GL_SPOT_EXPONENT */
-      1852, /* GL_SPOT_CUTOFF */
-       320, /* GL_CONSTANT_ATTENUATION */
-       868, /* GL_LINEAR_ATTENUATION */
-      1560, /* GL_QUADRATIC_ATTENUATION */
-       287, /* GL_COMPILE */
-       288, /* GL_COMPILE_AND_EXECUTE */
-       149, /* GL_BYTE */
-      2221, /* GL_UNSIGNED_BYTE */
-      1815, /* GL_SHORT */
-      2260, /* GL_UNSIGNED_SHORT */
-       790, /* GL_INT */
-      2224, /* GL_UNSIGNED_INT */
-       590, /* GL_FLOAT */
+      1274, /* GL_NAME_STACK_DEPTH */
+        72, /* GL_AUTO_NORMAL */
+       955, /* GL_MAP1_COLOR_4 */
+       958, /* GL_MAP1_INDEX */
+       959, /* GL_MAP1_NORMAL */
+       960, /* GL_MAP1_TEXTURE_COORD_1 */
+       961, /* GL_MAP1_TEXTURE_COORD_2 */
+       962, /* GL_MAP1_TEXTURE_COORD_3 */
+       963, /* GL_MAP1_TEXTURE_COORD_4 */
+       964, /* GL_MAP1_VERTEX_3 */
+       965, /* GL_MAP1_VERTEX_4 */
+       982, /* GL_MAP2_COLOR_4 */
+       985, /* GL_MAP2_INDEX */
+       986, /* GL_MAP2_NORMAL */
+       987, /* GL_MAP2_TEXTURE_COORD_1 */
+       988, /* GL_MAP2_TEXTURE_COORD_2 */
+       989, /* GL_MAP2_TEXTURE_COORD_3 */
+       990, /* GL_MAP2_TEXTURE_COORD_4 */
+       991, /* GL_MAP2_VERTEX_3 */
+       992, /* GL_MAP2_VERTEX_4 */
+       956, /* GL_MAP1_GRID_DOMAIN */
+       957, /* GL_MAP1_GRID_SEGMENTS */
+       983, /* GL_MAP2_GRID_DOMAIN */
+       984, /* GL_MAP2_GRID_SEGMENTS */
+      2055, /* GL_TEXTURE_1D */
+      2058, /* GL_TEXTURE_2D */
+       587, /* GL_FEEDBACK_BUFFER_POINTER */
+       588, /* GL_FEEDBACK_BUFFER_SIZE */
+       589, /* GL_FEEDBACK_BUFFER_TYPE */
+      1841, /* GL_SELECTION_BUFFER_POINTER */
+      1842, /* GL_SELECTION_BUFFER_SIZE */
+      2220, /* GL_TEXTURE_WIDTH */
+      2174, /* GL_TEXTURE_HEIGHT */
+      2113, /* GL_TEXTURE_COMPONENTS */
+      2091, /* GL_TEXTURE_BORDER_COLOR */
+      2090, /* GL_TEXTURE_BORDER */
+       473, /* GL_DONT_CARE */
+       585, /* GL_FASTEST */
+      1282, /* GL_NICEST */
+        58, /* GL_AMBIENT */
+       470, /* GL_DIFFUSE */
+      1894, /* GL_SPECULAR */
+      1461, /* GL_POSITION */
+      1897, /* GL_SPOT_DIRECTION */
+      1898, /* GL_SPOT_EXPONENT */
+      1896, /* GL_SPOT_CUTOFF */
+       326, /* GL_CONSTANT_ATTENUATION */
+       879, /* GL_LINEAR_ATTENUATION */
+      1578, /* GL_QUADRATIC_ATTENUATION */
+       289, /* GL_COMPILE */
+       290, /* GL_COMPILE_AND_EXECUTE */
+       151, /* GL_BYTE */
+      2280, /* GL_UNSIGNED_BYTE */
+      1859, /* GL_SHORT */
+      2320, /* GL_UNSIGNED_SHORT */
+       799, /* GL_INT */
+      2283, /* GL_UNSIGNED_INT */
+       598, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       472, /* GL_DOUBLE */
-       742, /* GL_HALF_FLOAT */
-       585, /* GL_FIXED */
-       165, /* GL_CLEAR */
-        58, /* GL_AND */
-        60, /* GL_AND_REVERSE */
-       351, /* GL_COPY */
-        59, /* GL_AND_INVERTED */
-      1269, /* GL_NOOP */
-      2356, /* GL_XOR */
-      1338, /* GL_OR */
-      1270, /* GL_NOR */
-       566, /* GL_EQUIV */
-       844, /* GL_INVERT */
-      1341, /* GL_OR_REVERSE */
-       352, /* GL_COPY_INVERTED */
-      1340, /* GL_OR_INVERTED */
-      1259, /* GL_NAND */
-      1804, /* GL_SET */
-       563, /* GL_EMISSION */
-      1814, /* GL_SHININESS */
-        57, /* GL_AMBIENT_AND_DIFFUSE */
-       232, /* GL_COLOR_INDEXES */
-      1208, /* GL_MODELVIEW */
-      1532, /* GL_PROJECTION */
-      1945, /* GL_TEXTURE */
-       188, /* GL_COLOR */
-       419, /* GL_DEPTH */
-      1876, /* GL_STENCIL */
-       231, /* GL_COLOR_INDEX */
-      1897, /* GL_STENCIL_INDEX */
-       435, /* GL_DEPTH_COMPONENT */
-      1597, /* GL_RED */
-       735, /* GL_GREEN */
-       110, /* GL_BLUE */
+       480, /* GL_DOUBLE */
+       751, /* GL_HALF_FLOAT */
+       593, /* GL_FIXED */
+       167, /* GL_CLEAR */
+        60, /* GL_AND */
+        62, /* GL_AND_REVERSE */
+       357, /* GL_COPY */
+        61, /* GL_AND_INVERTED */
+      1285, /* GL_NOOP */
+      2416, /* GL_XOR */
+      1356, /* GL_OR */
+      1286, /* GL_NOR */
+       574, /* GL_EQUIV */
+       855, /* GL_INVERT */
+      1359, /* GL_OR_REVERSE */
+       358, /* GL_COPY_INVERTED */
+      1358, /* GL_OR_INVERTED */
+      1275, /* GL_NAND */
+      1848, /* GL_SET */
+       571, /* GL_EMISSION */
+      1858, /* GL_SHININESS */
+        59, /* GL_AMBIENT_AND_DIFFUSE */
+       234, /* GL_COLOR_INDEXES */
+      1224, /* GL_MODELVIEW */
+      1550, /* GL_PROJECTION */
+      1990, /* GL_TEXTURE */
+       190, /* GL_COLOR */
+       425, /* GL_DEPTH */
+      1921, /* GL_STENCIL */
+       233, /* GL_COLOR_INDEX */
+      1942, /* GL_STENCIL_INDEX */
+       442, /* GL_DEPTH_COMPONENT */
+      1625, /* GL_RED */
+       744, /* GL_GREEN */
+       112, /* GL_BLUE */
         32, /* GL_ALPHA */
-      1655, /* GL_RGB */
-      1696, /* GL_RGBA */
-       903, /* GL_LUMINANCE */
-       930, /* GL_LUMINANCE_ALPHA */
-        86, /* GL_BITMAP */
-      1393, /* GL_POINT */
-       866, /* GL_LINE */
-       582, /* GL_FILL */
-      1611, /* GL_RENDER */
-       578, /* GL_FEEDBACK */
-      1796, /* GL_SELECT */
-       589, /* GL_FLAT */
-      1825, /* GL_SMOOTH */
-       845, /* GL_KEEP */
-      1644, /* GL_REPLACE */
-       771, /* GL_INCR */
-       415, /* GL_DECR */
-      2277, /* GL_VENDOR */
-      1641, /* GL_RENDERER */
-      2278, /* GL_VERSION */
-       571, /* GL_EXTENSIONS */
-      1744, /* GL_S */
-      1936, /* GL_T */
-      1580, /* GL_R */
-      1559, /* GL_Q */
-      1245, /* GL_MODULATE */
-       414, /* GL_DECAL */
-      2107, /* GL_TEXTURE_ENV_MODE */
-      2106, /* GL_TEXTURE_ENV_COLOR */
-      2105, /* GL_TEXTURE_ENV */
-       572, /* GL_EYE_LINEAR */
-      1299, /* GL_OBJECT_LINEAR */
-      1851, /* GL_SPHERE_MAP */
-      2111, /* GL_TEXTURE_GEN_MODE */
-      1301, /* GL_OBJECT_PLANE */
-       573, /* GL_EYE_PLANE */
-      1260, /* GL_NEAREST */
-       867, /* GL_LINEAR */
-      1264, /* GL_NEAREST_MIPMAP_NEAREST */
-       872, /* GL_LINEAR_MIPMAP_NEAREST */
-      1263, /* GL_NEAREST_MIPMAP_LINEAR */
-       871, /* GL_LINEAR_MIPMAP_LINEAR */
-      2134, /* GL_TEXTURE_MAG_FILTER */
-      2143, /* GL_TEXTURE_MIN_FILTER */
-      2164, /* GL_TEXTURE_WRAP_S */
-      2165, /* GL_TEXTURE_WRAP_T */
-       155, /* GL_CLAMP */
-      1643, /* GL_REPEAT */
-      1437, /* GL_POLYGON_OFFSET_UNITS */
-      1436, /* GL_POLYGON_OFFSET_POINT */
-      1435, /* GL_POLYGON_OFFSET_LINE */
-      1583, /* GL_R3_G3_B2 */
-      2274, /* GL_V2F */
-      2275, /* GL_V3F */
-       152, /* GL_C4UB_V2F */
-       153, /* GL_C4UB_V3F */
-       150, /* GL_C3F_V3F */
-      1257, /* GL_N3F_V3F */
-       151, /* GL_C4F_N3F_V3F */
-      1941, /* GL_T2F_V3F */
-      1943, /* GL_T4F_V4F */
-      1939, /* GL_T2F_C4UB_V3F */
-      1937, /* GL_T2F_C3F_V3F */
-      1940, /* GL_T2F_N3F_V3F */
-      1938, /* GL_T2F_C4F_N3F_V3F */
-      1942, /* GL_T4F_C4F_N3F_V4F */
-       172, /* GL_CLIP_DISTANCE0 */
-       173, /* GL_CLIP_DISTANCE1 */
-       174, /* GL_CLIP_DISTANCE2 */
-       175, /* GL_CLIP_DISTANCE3 */
-       176, /* GL_CLIP_DISTANCE4 */
-       177, /* GL_CLIP_DISTANCE5 */
-       178, /* GL_CLIP_DISTANCE6 */
-       179, /* GL_CLIP_DISTANCE7 */
-       851, /* GL_LIGHT0 */
-       852, /* GL_LIGHT1 */
-       853, /* GL_LIGHT2 */
-       854, /* GL_LIGHT3 */
-       855, /* GL_LIGHT4 */
-       856, /* GL_LIGHT5 */
-       857, /* GL_LIGHT6 */
-       858, /* GL_LIGHT7 */
-       746, /* GL_HINT_BIT */
-       322, /* GL_CONSTANT_COLOR */
-      1312, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       317, /* GL_CONSTANT_ALPHA */
-      1310, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-        89, /* GL_BLEND_COLOR */
-       711, /* GL_FUNC_ADD */
-      1190, /* GL_MIN */
-      1056, /* GL_MAX */
-        96, /* GL_BLEND_EQUATION */
-       717, /* GL_FUNC_SUBTRACT */
-       714, /* GL_FUNC_REVERSE_SUBTRACT */
-       331, /* GL_CONVOLUTION_1D */
-       332, /* GL_CONVOLUTION_2D */
-      1799, /* GL_SEPARABLE_2D */
-       335, /* GL_CONVOLUTION_BORDER_MODE */
-       339, /* GL_CONVOLUTION_FILTER_SCALE */
-       337, /* GL_CONVOLUTION_FILTER_BIAS */
-      1598, /* GL_REDUCE */
-       341, /* GL_CONVOLUTION_FORMAT */
-       345, /* GL_CONVOLUTION_WIDTH */
-       343, /* GL_CONVOLUTION_HEIGHT */
-      1075, /* GL_MAX_CONVOLUTION_WIDTH */
-      1073, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1476, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1472, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1467, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1463, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1474, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1470, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1465, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1461, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       747, /* GL_HISTOGRAM */
-      1539, /* GL_PROXY_HISTOGRAM */
-       763, /* GL_HISTOGRAM_WIDTH */
-       753, /* GL_HISTOGRAM_FORMAT */
-       759, /* GL_HISTOGRAM_RED_SIZE */
-       755, /* GL_HISTOGRAM_GREEN_SIZE */
-       750, /* GL_HISTOGRAM_BLUE_SIZE */
-       748, /* GL_HISTOGRAM_ALPHA_SIZE */
-       757, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       761, /* GL_HISTOGRAM_SINK */
-      1191, /* GL_MINMAX */
-      1193, /* GL_MINMAX_FORMAT */
-      1195, /* GL_MINMAX_SINK */
-      1944, /* GL_TABLE_TOO_LARGE_EXT */
-      2223, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2263, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2266, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2235, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2226, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1434, /* GL_POLYGON_OFFSET_FILL */
-      1433, /* GL_POLYGON_OFFSET_FACTOR */
-      1432, /* GL_POLYGON_OFFSET_BIAS */
-      1648, /* GL_RESCALE_NORMAL */
-        41, /* GL_ALPHA4 */
-        43, /* GL_ALPHA8 */
+      1694, /* GL_RGB */
+      1737, /* GL_RGBA */
+       914, /* GL_LUMINANCE */
+       943, /* GL_LUMINANCE_ALPHA */
+        88, /* GL_BITMAP */
+      1411, /* GL_POINT */
+       877, /* GL_LINE */
+       590, /* GL_FILL */
+      1639, /* GL_RENDER */
+       586, /* GL_FEEDBACK */
+      1840, /* GL_SELECT */
+       597, /* GL_FLAT */
+      1869, /* GL_SMOOTH */
+       856, /* GL_KEEP */
+      1672, /* GL_REPLACE */
+       780, /* GL_INCR */
+       421, /* GL_DECR */
+      2337, /* GL_VENDOR */
+      1669, /* GL_RENDERER */
+      2338, /* GL_VERSION */
+       579, /* GL_EXTENSIONS */
+      1788, /* GL_S */
+      1981, /* GL_T */
+      1598, /* GL_R */
+      1577, /* GL_Q */
+      1261, /* GL_MODULATE */
+       420, /* GL_DECAL */
+      2158, /* GL_TEXTURE_ENV_MODE */
+      2157, /* GL_TEXTURE_ENV_COLOR */
+      2156, /* GL_TEXTURE_ENV */
+       580, /* GL_EYE_LINEAR */
+      1315, /* GL_OBJECT_LINEAR */
+      1895, /* GL_SPHERE_MAP */
+      2162, /* GL_TEXTURE_GEN_MODE */
+      1317, /* GL_OBJECT_PLANE */
+       581, /* GL_EYE_PLANE */
+      1276, /* GL_NEAREST */
+       878, /* GL_LINEAR */
+      1280, /* GL_NEAREST_MIPMAP_NEAREST */
+       883, /* GL_LINEAR_MIPMAP_NEAREST */
+      1279, /* GL_NEAREST_MIPMAP_LINEAR */
+       882, /* GL_LINEAR_MIPMAP_LINEAR */
+      2191, /* GL_TEXTURE_MAG_FILTER */
+      2200, /* GL_TEXTURE_MIN_FILTER */
+      2223, /* GL_TEXTURE_WRAP_S */
+      2224, /* GL_TEXTURE_WRAP_T */
+       157, /* GL_CLAMP */
+      1671, /* GL_REPEAT */
+      1455, /* GL_POLYGON_OFFSET_UNITS */
+      1454, /* GL_POLYGON_OFFSET_POINT */
+      1453, /* GL_POLYGON_OFFSET_LINE */
+      1608, /* GL_R3_G3_B2 */
+      2334, /* GL_V2F */
+      2335, /* GL_V3F */
+       154, /* GL_C4UB_V2F */
+       155, /* GL_C4UB_V3F */
+       152, /* GL_C3F_V3F */
+      1273, /* GL_N3F_V3F */
+       153, /* GL_C4F_N3F_V3F */
+      1986, /* GL_T2F_V3F */
+      1988, /* GL_T4F_V4F */
+      1984, /* GL_T2F_C4UB_V3F */
+      1982, /* GL_T2F_C3F_V3F */
+      1985, /* GL_T2F_N3F_V3F */
+      1983, /* GL_T2F_C4F_N3F_V3F */
+      1987, /* GL_T4F_C4F_N3F_V4F */
+       174, /* GL_CLIP_DISTANCE0 */
+       175, /* GL_CLIP_DISTANCE1 */
+       176, /* GL_CLIP_DISTANCE2 */
+       177, /* GL_CLIP_DISTANCE3 */
+       178, /* GL_CLIP_DISTANCE4 */
+       179, /* GL_CLIP_DISTANCE5 */
+       180, /* GL_CLIP_DISTANCE6 */
+       181, /* GL_CLIP_DISTANCE7 */
+       862, /* GL_LIGHT0 */
+       863, /* GL_LIGHT1 */
+       864, /* GL_LIGHT2 */
+       865, /* GL_LIGHT3 */
+       866, /* GL_LIGHT4 */
+       867, /* GL_LIGHT5 */
+       868, /* GL_LIGHT6 */
+       869, /* GL_LIGHT7 */
+       755, /* GL_HINT_BIT */
+       328, /* GL_CONSTANT_COLOR */
+      1328, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       323, /* GL_CONSTANT_ALPHA */
+      1326, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+        91, /* GL_BLEND_COLOR */
+       720, /* GL_FUNC_ADD */
+      1206, /* GL_MIN */
+      1071, /* GL_MAX */
+        98, /* GL_BLEND_EQUATION */
+       726, /* GL_FUNC_SUBTRACT */
+       723, /* GL_FUNC_REVERSE_SUBTRACT */
+       337, /* GL_CONVOLUTION_1D */
+       338, /* GL_CONVOLUTION_2D */
+      1843, /* GL_SEPARABLE_2D */
+       341, /* GL_CONVOLUTION_BORDER_MODE */
+       345, /* GL_CONVOLUTION_FILTER_SCALE */
+       343, /* GL_CONVOLUTION_FILTER_BIAS */
+      1626, /* GL_REDUCE */
+       347, /* GL_CONVOLUTION_FORMAT */
+       351, /* GL_CONVOLUTION_WIDTH */
+       349, /* GL_CONVOLUTION_HEIGHT */
+      1090, /* GL_MAX_CONVOLUTION_WIDTH */
+      1088, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1494, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1490, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1485, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1481, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1492, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1488, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1483, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1479, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       756, /* GL_HISTOGRAM */
+      1557, /* GL_PROXY_HISTOGRAM */
+       772, /* GL_HISTOGRAM_WIDTH */
+       762, /* GL_HISTOGRAM_FORMAT */
+       768, /* GL_HISTOGRAM_RED_SIZE */
+       764, /* GL_HISTOGRAM_GREEN_SIZE */
+       759, /* GL_HISTOGRAM_BLUE_SIZE */
+       757, /* GL_HISTOGRAM_ALPHA_SIZE */
+       766, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       770, /* GL_HISTOGRAM_SINK */
+      1207, /* GL_MINMAX */
+      1209, /* GL_MINMAX_FORMAT */
+      1211, /* GL_MINMAX_SINK */
+      1989, /* GL_TABLE_TOO_LARGE_EXT */
+      2282, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2323, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2326, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2294, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2285, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1452, /* GL_POLYGON_OFFSET_FILL */
+      1451, /* GL_POLYGON_OFFSET_FACTOR */
+      1450, /* GL_POLYGON_OFFSET_BIAS */
+      1676, /* GL_RESCALE_NORMAL */
+        43, /* GL_ALPHA4 */
+        45, /* GL_ALPHA8 */
         33, /* GL_ALPHA12 */
         35, /* GL_ALPHA16 */
-       918, /* GL_LUMINANCE4 */
-       924, /* GL_LUMINANCE8 */
-       904, /* GL_LUMINANCE12 */
-       910, /* GL_LUMINANCE16 */
-       919, /* GL_LUMINANCE4_ALPHA4 */
-       922, /* GL_LUMINANCE6_ALPHA2 */
-       927, /* GL_LUMINANCE8_ALPHA8 */
-       907, /* GL_LUMINANCE12_ALPHA4 */
-       905, /* GL_LUMINANCE12_ALPHA12 */
-       913, /* GL_LUMINANCE16_ALPHA16 */
-       791, /* GL_INTENSITY */
-       800, /* GL_INTENSITY4 */
-       802, /* GL_INTENSITY8 */
-       792, /* GL_INTENSITY12 */
-       794, /* GL_INTENSITY16 */
-      1671, /* GL_RGB2_EXT */
-      1677, /* GL_RGB4 */
-      1680, /* GL_RGB5 */
-      1687, /* GL_RGB8 */
-      1656, /* GL_RGB10 */
-      1661, /* GL_RGB12 */
-      1663, /* GL_RGB16 */
-      1707, /* GL_RGBA2 */
-      1714, /* GL_RGBA4 */
-      1683, /* GL_RGB5_A1 */
-      1719, /* GL_RGBA8 */
-      1657, /* GL_RGB10_A2 */
-      1697, /* GL_RGBA12 */
-      1699, /* GL_RGBA16 */
-      2151, /* GL_TEXTURE_RED_SIZE */
-      2119, /* GL_TEXTURE_GREEN_SIZE */
-      2039, /* GL_TEXTURE_BLUE_SIZE */
-      2018, /* GL_TEXTURE_ALPHA_SIZE */
-      2132, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2123, /* GL_TEXTURE_INTENSITY_SIZE */
-      1645, /* GL_REPLACE_EXT */
-      1543, /* GL_PROXY_TEXTURE_1D */
-      1547, /* GL_PROXY_TEXTURE_2D */
-      2159, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2145, /* GL_TEXTURE_PRIORITY */
-      2153, /* GL_TEXTURE_RESIDENT */
-      2021, /* GL_TEXTURE_BINDING_1D */
-      2024, /* GL_TEXTURE_BINDING_2D */
-      2027, /* GL_TEXTURE_BINDING_3D */
-      1348, /* GL_PACK_SKIP_IMAGES */
-      1344, /* GL_PACK_IMAGE_HEIGHT */
-      2216, /* GL_UNPACK_SKIP_IMAGES */
-      2213, /* GL_UNPACK_IMAGE_HEIGHT */
-      2016, /* GL_TEXTURE_3D */
-      1551, /* GL_PROXY_TEXTURE_3D */
-      2102, /* GL_TEXTURE_DEPTH */
-      2162, /* GL_TEXTURE_WRAP_R */
-      1057, /* GL_MAX_3D_TEXTURE_SIZE */
-      2279, /* GL_VERTEX_ARRAY */
-      1272, /* GL_NORMAL_ARRAY */
-       189, /* GL_COLOR_ARRAY */
-       775, /* GL_INDEX_ARRAY */
-      2072, /* GL_TEXTURE_COORD_ARRAY */
-       555, /* GL_EDGE_FLAG_ARRAY */
-      2285, /* GL_VERTEX_ARRAY_SIZE */
-      2287, /* GL_VERTEX_ARRAY_TYPE */
-      2286, /* GL_VERTEX_ARRAY_STRIDE */
-      1277, /* GL_NORMAL_ARRAY_TYPE */
-      1276, /* GL_NORMAL_ARRAY_STRIDE */
-       193, /* GL_COLOR_ARRAY_SIZE */
-       195, /* GL_COLOR_ARRAY_TYPE */
-       194, /* GL_COLOR_ARRAY_STRIDE */
-       780, /* GL_INDEX_ARRAY_TYPE */
-       779, /* GL_INDEX_ARRAY_STRIDE */
-      2076, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2078, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2077, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       559, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2284, /* GL_VERTEX_ARRAY_POINTER */
-      1275, /* GL_NORMAL_ARRAY_POINTER */
-       192, /* GL_COLOR_ARRAY_POINTER */
-       778, /* GL_INDEX_ARRAY_POINTER */
-      2075, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       558, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1250, /* GL_MULTISAMPLE */
-      1773, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1775, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1780, /* GL_SAMPLE_COVERAGE */
-      1777, /* GL_SAMPLE_BUFFERS */
-      1768, /* GL_SAMPLES */
-      1784, /* GL_SAMPLE_COVERAGE_VALUE */
-      1782, /* GL_SAMPLE_COVERAGE_INVERT */
-       237, /* GL_COLOR_MATRIX */
-       239, /* GL_COLOR_MATRIX_STACK_DEPTH */
-      1069, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1459, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1455, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1450, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1446, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1457, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1453, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1448, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1444, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      2055, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1552, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      2057, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-        94, /* GL_BLEND_DST_RGB */
-       108, /* GL_BLEND_SRC_RGB */
-        92, /* GL_BLEND_DST_ALPHA */
-       106, /* GL_BLEND_SRC_ALPHA */
-       243, /* GL_COLOR_TABLE */
-      1469, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1452, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1538, /* GL_PROXY_COLOR_TABLE */
-      1542, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1541, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       267, /* GL_COLOR_TABLE_SCALE */
-       247, /* GL_COLOR_TABLE_BIAS */
-       252, /* GL_COLOR_TABLE_FORMAT */
-       269, /* GL_COLOR_TABLE_WIDTH */
-       264, /* GL_COLOR_TABLE_RED_SIZE */
-       255, /* GL_COLOR_TABLE_GREEN_SIZE */
-       249, /* GL_COLOR_TABLE_BLUE_SIZE */
-       244, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       261, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       258, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-        79, /* GL_BGR */
-        80, /* GL_BGRA */
-      1087, /* GL_MAX_ELEMENTS_VERTICES */
-      1086, /* GL_MAX_ELEMENTS_INDICES */
-      2122, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1415, /* GL_POINT_SIZE_MIN */
-      1411, /* GL_POINT_SIZE_MAX */
-      1400, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1396, /* GL_POINT_DISTANCE_ATTENUATION */
-       159, /* GL_CLAMP_TO_BORDER */
-       162, /* GL_CLAMP_TO_EDGE */
-      2144, /* GL_TEXTURE_MIN_LOD */
-      2142, /* GL_TEXTURE_MAX_LOD */
-      2020, /* GL_TEXTURE_BASE_LEVEL */
-      2141, /* GL_TEXTURE_MAX_LEVEL */
-       766, /* GL_IGNORE_BORDER_HP */
-       321, /* GL_CONSTANT_BORDER_HP */
-      1646, /* GL_REPLICATE_BORDER_HP */
-       333, /* GL_CONVOLUTION_BORDER_COLOR */
-      1307, /* GL_OCCLUSION_TEST_HP */
-      1308, /* GL_OCCLUSION_TEST_RESULT_HP */
-       869, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      2049, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      2051, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      2053, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      2054, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      2052, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      2050, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-      1063, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-      1064, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1479, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1481, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1478, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1480, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2130, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2131, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2129, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       720, /* GL_GENERATE_MIPMAP */
-       721, /* GL_GENERATE_MIPMAP_HINT */
-       633, /* GL_FOG_OFFSET_SGIX */
-       634, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2063, /* GL_TEXTURE_COMPARE_SGIX */
-      2062, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2126, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2118, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       436, /* GL_DEPTH_COMPONENT16 */
-       440, /* GL_DEPTH_COMPONENT24 */
-       444, /* GL_DEPTH_COMPONENT32 */
-       358, /* GL_CULL_VERTEX_EXT */
-       360, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       359, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2352, /* GL_WRAP_BORDER_SUN */
-      2056, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       862, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1818, /* GL_SINGLE_COLOR */
-      1802, /* GL_SEPARATE_SPECULAR_COLOR */
-      1813, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       645, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       646, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       657, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       648, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       644, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       643, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       647, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       658, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       675, /* GL_FRAMEBUFFER_DEFAULT */
-       702, /* GL_FRAMEBUFFER_UNDEFINED */
-       452, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       939, /* GL_MAJOR_VERSION */
-      1197, /* GL_MINOR_VERSION */
-      1287, /* GL_NUM_EXTENSIONS */
-       327, /* GL_CONTEXT_FLAGS */
-       774, /* GL_INDEX */
-       430, /* GL_DEPTH_BUFFER */
-      1892, /* GL_STENCIL_BUFFER */
-       298, /* GL_COMPRESSED_RED */
-       299, /* GL_COMPRESSED_RG */
-       397, /* GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB */
-       395, /* GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB */
-       392, /* GL_DEBUG_CALLBACK_FUNCTION_ARB */
-       393, /* GL_DEBUG_CALLBACK_USER_PARAM_ARB */
-       402, /* GL_DEBUG_SOURCE_API_ARB */
-       407, /* GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB */
-       405, /* GL_DEBUG_SOURCE_SHADER_COMPILER_ARB */
-       406, /* GL_DEBUG_SOURCE_THIRD_PARTY_ARB */
-       403, /* GL_DEBUG_SOURCE_APPLICATION_ARB */
-       404, /* GL_DEBUG_SOURCE_OTHER_ARB */
-       409, /* GL_DEBUG_TYPE_ERROR_ARB */
-       408, /* GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB */
-       413, /* GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB */
-       412, /* GL_DEBUG_TYPE_PORTABILITY_ARB */
-       411, /* GL_DEBUG_TYPE_PERFORMANCE_ARB */
-       410, /* GL_DEBUG_TYPE_OTHER_ARB */
-       899, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
-       741, /* GL_GUILTY_CONTEXT_RESET_ARB */
-       789, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-      2211, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-      1650, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-      1501, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-      1284, /* GL_NO_RESET_NOTIFICATION_ARB */
-      2222, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2267, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2268, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2264, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2261, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2236, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2232, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2139, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2140, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2138, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-      1200, /* GL_MIRRORED_REPEAT */
-      1737, /* GL_RGB_S3TC */
-      1679, /* GL_RGB4_S3TC */
-      1733, /* GL_RGBA_S3TC */
-      1718, /* GL_RGBA4_S3TC */
-      1727, /* GL_RGBA_DXT5_S3TC */
-      1715, /* GL_RGBA4_DXT5_S3TC */
-       309, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       304, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       305, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       306, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1262, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1261, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       870, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       620, /* GL_FOG_COORDINATE_SOURCE */
-       612, /* GL_FOG_COORD */
-       636, /* GL_FRAGMENT_DEPTH */
-       364, /* GL_CURRENT_FOG_COORD */
-       619, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       618, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       617, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       614, /* GL_FOG_COORDINATE_ARRAY */
-       241, /* GL_COLOR_SUM */
-       385, /* GL_CURRENT_SECONDARY_COLOR */
-      1793, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1795, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1794, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1792, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1789, /* GL_SECONDARY_COLOR_ARRAY */
-       383, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       931, /* GL_LUMINANCE4 */
+       937, /* GL_LUMINANCE8 */
+       915, /* GL_LUMINANCE12 */
+       921, /* GL_LUMINANCE16 */
+       932, /* GL_LUMINANCE4_ALPHA4 */
+       935, /* GL_LUMINANCE6_ALPHA2 */
+       940, /* GL_LUMINANCE8_ALPHA8 */
+       918, /* GL_LUMINANCE12_ALPHA4 */
+       916, /* GL_LUMINANCE12_ALPHA12 */
+       925, /* GL_LUMINANCE16_ALPHA16 */
+       800, /* GL_INTENSITY */
+       811, /* GL_INTENSITY4 */
+       813, /* GL_INTENSITY8 */
+       801, /* GL_INTENSITY12 */
+       803, /* GL_INTENSITY16 */
+      1711, /* GL_RGB2_EXT */
+      1718, /* GL_RGB4 */
+      1721, /* GL_RGB5 */
+      1728, /* GL_RGB8 */
+      1695, /* GL_RGB10 */
+      1700, /* GL_RGB12 */
+      1702, /* GL_RGB16 */
+      1749, /* GL_RGBA2 */
+      1757, /* GL_RGBA4 */
+      1724, /* GL_RGB5_A1 */
+      1762, /* GL_RGBA8 */
+      1696, /* GL_RGB10_A2 */
+      1738, /* GL_RGBA12 */
+      1740, /* GL_RGBA16 */
+      2208, /* GL_TEXTURE_RED_SIZE */
+      2170, /* GL_TEXTURE_GREEN_SIZE */
+      2086, /* GL_TEXTURE_BLUE_SIZE */
+      2063, /* GL_TEXTURE_ALPHA_SIZE */
+      2187, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2176, /* GL_TEXTURE_INTENSITY_SIZE */
+      1673, /* GL_REPLACE_EXT */
+      1561, /* GL_PROXY_TEXTURE_1D */
+      1565, /* GL_PROXY_TEXTURE_2D */
+      2218, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2202, /* GL_TEXTURE_PRIORITY */
+      2212, /* GL_TEXTURE_RESIDENT */
+      2068, /* GL_TEXTURE_BINDING_1D */
+      2071, /* GL_TEXTURE_BINDING_2D */
+      2074, /* GL_TEXTURE_BINDING_3D */
+      1366, /* GL_PACK_SKIP_IMAGES */
+      1362, /* GL_PACK_IMAGE_HEIGHT */
+      2275, /* GL_UNPACK_SKIP_IMAGES */
+      2272, /* GL_UNPACK_IMAGE_HEIGHT */
+      2061, /* GL_TEXTURE_3D */
+      1569, /* GL_PROXY_TEXTURE_3D */
+      2151, /* GL_TEXTURE_DEPTH */
+      2221, /* GL_TEXTURE_WRAP_R */
+      1072, /* GL_MAX_3D_TEXTURE_SIZE */
+      2339, /* GL_VERTEX_ARRAY */
+      1288, /* GL_NORMAL_ARRAY */
+       191, /* GL_COLOR_ARRAY */
+       784, /* GL_INDEX_ARRAY */
+      2121, /* GL_TEXTURE_COORD_ARRAY */
+       563, /* GL_EDGE_FLAG_ARRAY */
+      2345, /* GL_VERTEX_ARRAY_SIZE */
+      2347, /* GL_VERTEX_ARRAY_TYPE */
+      2346, /* GL_VERTEX_ARRAY_STRIDE */
+      1293, /* GL_NORMAL_ARRAY_TYPE */
+      1292, /* GL_NORMAL_ARRAY_STRIDE */
+       195, /* GL_COLOR_ARRAY_SIZE */
+       197, /* GL_COLOR_ARRAY_TYPE */
+       196, /* GL_COLOR_ARRAY_STRIDE */
+       789, /* GL_INDEX_ARRAY_TYPE */
+       788, /* GL_INDEX_ARRAY_STRIDE */
+      2125, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2127, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2126, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       567, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      2344, /* GL_VERTEX_ARRAY_POINTER */
+      1291, /* GL_NORMAL_ARRAY_POINTER */
+       194, /* GL_COLOR_ARRAY_POINTER */
+       787, /* GL_INDEX_ARRAY_POINTER */
+      2124, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       566, /* GL_EDGE_FLAG_ARRAY_POINTER */
+      1266, /* GL_MULTISAMPLE */
+      1817, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1819, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1824, /* GL_SAMPLE_COVERAGE */
+      1821, /* GL_SAMPLE_BUFFERS */
+      1812, /* GL_SAMPLES */
+      1828, /* GL_SAMPLE_COVERAGE_VALUE */
+      1826, /* GL_SAMPLE_COVERAGE_INVERT */
+       239, /* GL_COLOR_MATRIX */
+       241, /* GL_COLOR_MATRIX_STACK_DEPTH */
+      1084, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1477, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1473, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1468, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1464, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1475, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1471, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1466, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1462, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      2104, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1570, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      2106, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+        96, /* GL_BLEND_DST_RGB */
+       110, /* GL_BLEND_SRC_RGB */
+        94, /* GL_BLEND_DST_ALPHA */
+       108, /* GL_BLEND_SRC_ALPHA */
+       245, /* GL_COLOR_TABLE */
+      1487, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1470, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1556, /* GL_PROXY_COLOR_TABLE */
+      1560, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1559, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       269, /* GL_COLOR_TABLE_SCALE */
+       249, /* GL_COLOR_TABLE_BIAS */
+       254, /* GL_COLOR_TABLE_FORMAT */
+       271, /* GL_COLOR_TABLE_WIDTH */
+       266, /* GL_COLOR_TABLE_RED_SIZE */
+       257, /* GL_COLOR_TABLE_GREEN_SIZE */
+       251, /* GL_COLOR_TABLE_BLUE_SIZE */
+       246, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       263, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       260, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+        81, /* GL_BGR */
+        82, /* GL_BGRA */
+      1103, /* GL_MAX_ELEMENTS_VERTICES */
+      1102, /* GL_MAX_ELEMENTS_INDICES */
+      2175, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       188, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1433, /* GL_POINT_SIZE_MIN */
+      1429, /* GL_POINT_SIZE_MAX */
+      1418, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1414, /* GL_POINT_DISTANCE_ATTENUATION */
+       161, /* GL_CLAMP_TO_BORDER */
+       164, /* GL_CLAMP_TO_EDGE */
+      2201, /* GL_TEXTURE_MIN_LOD */
+      2199, /* GL_TEXTURE_MAX_LOD */
+      2067, /* GL_TEXTURE_BASE_LEVEL */
+      2198, /* GL_TEXTURE_MAX_LEVEL */
+       775, /* GL_IGNORE_BORDER_HP */
+       327, /* GL_CONSTANT_BORDER_HP */
+      1674, /* GL_REPLICATE_BORDER_HP */
+       339, /* GL_CONVOLUTION_BORDER_COLOR */
+      1323, /* GL_OCCLUSION_TEST_HP */
+      1324, /* GL_OCCLUSION_TEST_RESULT_HP */
+       880, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      2098, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      2100, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      2102, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      2103, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      2101, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      2099, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1078, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+      1079, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1497, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1499, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1496, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1498, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      2185, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2186, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2184, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       729, /* GL_GENERATE_MIPMAP */
+       730, /* GL_GENERATE_MIPMAP_HINT */
+       642, /* GL_FOG_OFFSET_SGIX */
+       643, /* GL_FOG_OFFSET_VALUE_SGIX */
+      2112, /* GL_TEXTURE_COMPARE_SGIX */
+      2111, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2181, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2169, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       443, /* GL_DEPTH_COMPONENT16 */
+       447, /* GL_DEPTH_COMPONENT24 */
+       451, /* GL_DEPTH_COMPONENT32 */
+       364, /* GL_CULL_VERTEX_EXT */
+       366, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       365, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      2412, /* GL_WRAP_BORDER_SUN */
+      2105, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       873, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1862, /* GL_SINGLE_COLOR */
+      1846, /* GL_SEPARATE_SPECULAR_COLOR */
+      1857, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       654, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       655, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       666, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       657, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       653, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       652, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       656, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       667, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       684, /* GL_FRAMEBUFFER_DEFAULT */
+       711, /* GL_FRAMEBUFFER_UNDEFINED */
+       460, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       954, /* GL_MAJOR_VERSION */
+      1213, /* GL_MINOR_VERSION */
+      1303, /* GL_NUM_EXTENSIONS */
+       333, /* GL_CONTEXT_FLAGS */
+       783, /* GL_INDEX */
+       437, /* GL_DEPTH_BUFFER */
+      1937, /* GL_STENCIL_BUFFER */
+       300, /* GL_COMPRESSED_RED */
+       302, /* GL_COMPRESSED_RG */
+      1681, /* GL_RG */
+      1785, /* GL_RG_INTEGER */
+      1609, /* GL_R8 */
+      1600, /* GL_R16 */
+      1690, /* GL_RG8 */
+      1682, /* GL_RG16 */
+      1601, /* GL_R16F */
+      1605, /* GL_R32F */
+      1683, /* GL_RG16F */
+      1687, /* GL_RG32F */
+      1610, /* GL_R8I */
+      1611, /* GL_R8UI */
+      1602, /* GL_R16I */
+      1603, /* GL_R16UI */
+      1606, /* GL_R32I */
+      1607, /* GL_R32UI */
+      1691, /* GL_RG8I */
+      1692, /* GL_RG8UI */
+      1684, /* GL_RG16I */
+      1685, /* GL_RG16UI */
+      1688, /* GL_RG32I */
+      1689, /* GL_RG32UI */
+       403, /* GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB */
+       401, /* GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB */
+       398, /* GL_DEBUG_CALLBACK_FUNCTION_ARB */
+       399, /* GL_DEBUG_CALLBACK_USER_PARAM_ARB */
+       408, /* GL_DEBUG_SOURCE_API_ARB */
+       413, /* GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB */
+       411, /* GL_DEBUG_SOURCE_SHADER_COMPILER_ARB */
+       412, /* GL_DEBUG_SOURCE_THIRD_PARTY_ARB */
+       409, /* GL_DEBUG_SOURCE_APPLICATION_ARB */
+       410, /* GL_DEBUG_SOURCE_OTHER_ARB */
+       415, /* GL_DEBUG_TYPE_ERROR_ARB */
+       414, /* GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB */
+       419, /* GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB */
+       418, /* GL_DEBUG_TYPE_PORTABILITY_ARB */
+       417, /* GL_DEBUG_TYPE_PERFORMANCE_ARB */
+       416, /* GL_DEBUG_TYPE_OTHER_ARB */
+       910, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
+       750, /* GL_GUILTY_CONTEXT_RESET_ARB */
+       798, /* GL_INNOCENT_CONTEXT_RESET_ARB */
+      2270, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+      1678, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+      1519, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+      1300, /* GL_NO_RESET_NOTIFICATION_ARB */
+      2281, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2327, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2328, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2324, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2321, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2295, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2291, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2196, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2197, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2195, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1216, /* GL_MIRRORED_REPEAT */
+      1780, /* GL_RGB_S3TC */
+      1720, /* GL_RGB4_S3TC */
+      1776, /* GL_RGBA_S3TC */
+      1761, /* GL_RGBA4_S3TC */
+      1770, /* GL_RGBA_DXT5_S3TC */
+      1758, /* GL_RGBA4_DXT5_S3TC */
+       312, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       307, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       308, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       309, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1278, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1277, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       881, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       629, /* GL_FOG_COORDINATE_SOURCE */
+       621, /* GL_FOG_COORD */
+       645, /* GL_FRAGMENT_DEPTH */
+       370, /* GL_CURRENT_FOG_COORD */
+       628, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       627, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       626, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       623, /* GL_FOG_COORDINATE_ARRAY */
+       243, /* GL_COLOR_SUM */
+       391, /* GL_CURRENT_SECONDARY_COLOR */
+      1837, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1839, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1838, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1836, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1833, /* GL_SECONDARY_COLOR_ARRAY */
+       389, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1946, /* GL_TEXTURE0 */
-      1948, /* GL_TEXTURE1 */
-      1970, /* GL_TEXTURE2 */
-      1992, /* GL_TEXTURE3 */
-      1998, /* GL_TEXTURE4 */
-      2000, /* GL_TEXTURE5 */
-      2002, /* GL_TEXTURE6 */
-      2004, /* GL_TEXTURE7 */
-      2006, /* GL_TEXTURE8 */
-      2008, /* GL_TEXTURE9 */
-      1949, /* GL_TEXTURE10 */
-      1951, /* GL_TEXTURE11 */
-      1953, /* GL_TEXTURE12 */
-      1955, /* GL_TEXTURE13 */
-      1957, /* GL_TEXTURE14 */
-      1959, /* GL_TEXTURE15 */
-      1961, /* GL_TEXTURE16 */
-      1963, /* GL_TEXTURE17 */
-      1965, /* GL_TEXTURE18 */
-      1967, /* GL_TEXTURE19 */
-      1971, /* GL_TEXTURE20 */
-      1973, /* GL_TEXTURE21 */
-      1975, /* GL_TEXTURE22 */
-      1977, /* GL_TEXTURE23 */
-      1979, /* GL_TEXTURE24 */
-      1981, /* GL_TEXTURE25 */
-      1983, /* GL_TEXTURE26 */
-      1985, /* GL_TEXTURE27 */
-      1987, /* GL_TEXTURE28 */
-      1989, /* GL_TEXTURE29 */
-      1993, /* GL_TEXTURE30 */
-      1995, /* GL_TEXTURE31 */
+      1991, /* GL_TEXTURE0 */
+      1993, /* GL_TEXTURE1 */
+      2015, /* GL_TEXTURE2 */
+      2037, /* GL_TEXTURE3 */
+      2043, /* GL_TEXTURE4 */
+      2045, /* GL_TEXTURE5 */
+      2047, /* GL_TEXTURE6 */
+      2049, /* GL_TEXTURE7 */
+      2051, /* GL_TEXTURE8 */
+      2053, /* GL_TEXTURE9 */
+      1994, /* GL_TEXTURE10 */
+      1996, /* GL_TEXTURE11 */
+      1998, /* GL_TEXTURE12 */
+      2000, /* GL_TEXTURE13 */
+      2002, /* GL_TEXTURE14 */
+      2004, /* GL_TEXTURE15 */
+      2006, /* GL_TEXTURE16 */
+      2008, /* GL_TEXTURE17 */
+      2010, /* GL_TEXTURE18 */
+      2012, /* GL_TEXTURE19 */
+      2016, /* GL_TEXTURE20 */
+      2018, /* GL_TEXTURE21 */
+      2020, /* GL_TEXTURE22 */
+      2022, /* GL_TEXTURE23 */
+      2024, /* GL_TEXTURE24 */
+      2026, /* GL_TEXTURE25 */
+      2028, /* GL_TEXTURE26 */
+      2030, /* GL_TEXTURE27 */
+      2032, /* GL_TEXTURE28 */
+      2034, /* GL_TEXTURE29 */
+      2038, /* GL_TEXTURE30 */
+      2040, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
-       166, /* GL_CLIENT_ACTIVE_TEXTURE */
-      1162, /* GL_MAX_TEXTURE_UNITS */
-      2194, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2197, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2199, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2191, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1928, /* GL_SUBTRACT */
-      1143, /* GL_MAX_RENDERBUFFER_SIZE */
-       290, /* GL_COMPRESSED_ALPHA */
-       294, /* GL_COMPRESSED_LUMINANCE */
-       295, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       292, /* GL_COMPRESSED_INTENSITY */
-       300, /* GL_COMPRESSED_RGB */
-       301, /* GL_COMPRESSED_RGBA */
-      2070, /* GL_TEXTURE_COMPRESSION_HINT */
-      2148, /* GL_TEXTURE_RECTANGLE */
-      2035, /* GL_TEXTURE_BINDING_RECTANGLE */
-      1555, /* GL_PROXY_TEXTURE_RECTANGLE */
-      1140, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
-       451, /* GL_DEPTH_STENCIL */
-      2228, /* GL_UNSIGNED_INT_24_8 */
-      1157, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2137, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-      1159, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2109, /* GL_TEXTURE_FILTER_CONTROL */
-      2127, /* GL_TEXTURE_LOD_BIAS */
-       274, /* GL_COMBINE4 */
-      1149, /* GL_MAX_SHININESS_NV */
-      1150, /* GL_MAX_SPOT_EXPONENT_NV */
-       772, /* GL_INCR_WRAP */
-       416, /* GL_DECR_WRAP */
-      1220, /* GL_MODELVIEW1_ARB */
-      1278, /* GL_NORMAL_MAP */
-      1606, /* GL_REFLECTION_MAP */
-      2080, /* GL_TEXTURE_CUBE_MAP */
-      2031, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2092, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2082, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2095, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2085, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2098, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2088, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1553, /* GL_PROXY_TEXTURE_CUBE_MAP */
-      1077, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1256, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-      1493, /* GL_PRIMITIVE_RESTART_NV */
-      1492, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-       628, /* GL_FOG_DISTANCE_MODE_NV */
-       575, /* GL_EYE_RADIAL_NV */
-       574, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       273, /* GL_COMBINE */
-       280, /* GL_COMBINE_RGB */
-       275, /* GL_COMBINE_ALPHA */
-      1738, /* GL_RGB_SCALE */
+       168, /* GL_CLIENT_ACTIVE_TEXTURE */
+      1178, /* GL_MAX_TEXTURE_UNITS */
+      2253, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2256, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2258, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2250, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1973, /* GL_SUBTRACT */
+      1159, /* GL_MAX_RENDERBUFFER_SIZE */
+       292, /* GL_COMPRESSED_ALPHA */
+       296, /* GL_COMPRESSED_LUMINANCE */
+       297, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       294, /* GL_COMPRESSED_INTENSITY */
+       303, /* GL_COMPRESSED_RGB */
+       304, /* GL_COMPRESSED_RGBA */
+      2119, /* GL_TEXTURE_COMPRESSION_HINT */
+      2205, /* GL_TEXTURE_RECTANGLE */
+      2082, /* GL_TEXTURE_BINDING_RECTANGLE */
+      1573, /* GL_PROXY_TEXTURE_RECTANGLE */
+      1156, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+       459, /* GL_DEPTH_STENCIL */
+      2287, /* GL_UNSIGNED_INT_24_8 */
+      1173, /* GL_MAX_TEXTURE_LOD_BIAS */
+      2194, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1175, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      2160, /* GL_TEXTURE_FILTER_CONTROL */
+      2182, /* GL_TEXTURE_LOD_BIAS */
+       276, /* GL_COMBINE4 */
+      1165, /* GL_MAX_SHININESS_NV */
+      1166, /* GL_MAX_SPOT_EXPONENT_NV */
+       781, /* GL_INCR_WRAP */
+       422, /* GL_DECR_WRAP */
+      1236, /* GL_MODELVIEW1_ARB */
+      1294, /* GL_NORMAL_MAP */
+      1634, /* GL_REFLECTION_MAP */
+      2129, /* GL_TEXTURE_CUBE_MAP */
+      2078, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2141, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2131, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2144, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2134, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2147, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2137, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1571, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1092, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+      1272, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+      1511, /* GL_PRIMITIVE_RESTART_NV */
+      1510, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+       637, /* GL_FOG_DISTANCE_MODE_NV */
+       583, /* GL_EYE_RADIAL_NV */
+       582, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       275, /* GL_COMBINE */
+       282, /* GL_COMBINE_RGB */
+       277, /* GL_COMBINE_ALPHA */
+      1781, /* GL_RGB_SCALE */
         25, /* GL_ADD_SIGNED */
-       809, /* GL_INTERPOLATE */
-       316, /* GL_CONSTANT */
-      1485, /* GL_PRIMARY_COLOR */
-      1482, /* GL_PREVIOUS */
-      1833, /* GL_SOURCE0_RGB */
-      1839, /* GL_SOURCE1_RGB */
-      1845, /* GL_SOURCE2_RGB */
-      1849, /* GL_SOURCE3_RGB_NV */
-      1830, /* GL_SOURCE0_ALPHA */
-      1836, /* GL_SOURCE1_ALPHA */
-      1842, /* GL_SOURCE2_ALPHA */
-      1848, /* GL_SOURCE3_ALPHA_NV */
-      1321, /* GL_OPERAND0_RGB */
-      1327, /* GL_OPERAND1_RGB */
-      1333, /* GL_OPERAND2_RGB */
-      1337, /* GL_OPERAND3_RGB_NV */
-      1318, /* GL_OPERAND0_ALPHA */
-      1324, /* GL_OPERAND1_ALPHA */
-      1330, /* GL_OPERAND2_ALPHA */
-      1336, /* GL_OPERAND3_ALPHA_NV */
-       137, /* GL_BUFFER_OBJECT_APPLE */
-      2280, /* GL_VERTEX_ARRAY_BINDING */
-      2146, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2147, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2357, /* GL_YCBCR_422_APPLE */
-      2269, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2271, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2158, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1919, /* GL_STORAGE_PRIVATE_APPLE */
-      1918, /* GL_STORAGE_CACHED_APPLE */
-      1920, /* GL_STORAGE_SHARED_APPLE */
-      1820, /* GL_SLICE_ACCUM_SUN */
-      1564, /* GL_QUAD_MESH_SUN */
-      2205, /* GL_TRIANGLE_MESH_SUN */
-      2322, /* GL_VERTEX_PROGRAM_ARB */
-      2333, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2307, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2315, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2317, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2319, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       387, /* GL_CURRENT_VERTEX_ATTRIB */
-      1509, /* GL_PROGRAM_LENGTH_ARB */
-      1525, /* GL_PROGRAM_STRING_ARB */
-      1243, /* GL_MODELVIEW_PROJECTION_NV */
-       765, /* GL_IDENTITY_NV */
-       842, /* GL_INVERSE_NV */
-      2196, /* GL_TRANSPOSE_NV */
-       843, /* GL_INVERSE_TRANSPOSE_NV */
-      1125, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-      1124, /* GL_MAX_PROGRAM_MATRICES_ARB */
-      1003, /* GL_MATRIX0_NV */
-      1015, /* GL_MATRIX1_NV */
-      1027, /* GL_MATRIX2_NV */
-      1031, /* GL_MATRIX3_NV */
-      1033, /* GL_MATRIX4_NV */
-      1035, /* GL_MATRIX5_NV */
-      1037, /* GL_MATRIX6_NV */
-      1039, /* GL_MATRIX7_NV */
-       370, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       367, /* GL_CURRENT_MATRIX_ARB */
-      1522, /* GL_PROGRAM_POINT_SIZE */
-      2328, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1521, /* GL_PROGRAM_PARAMETER_NV */
-      2313, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1527, /* GL_PROGRAM_TARGET_NV */
-      1524, /* GL_PROGRAM_RESIDENT_NV */
-      2168, /* GL_TRACK_MATRIX_NV */
-      2169, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2323, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1503, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       432, /* GL_DEPTH_CLAMP */
-      2288, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2295, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2296, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2297, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2298, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2299, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2300, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2301, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2302, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2303, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2289, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2290, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2291, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2292, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2293, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2294, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       951, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       958, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       959, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       960, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       961, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       962, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       963, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       964, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       965, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       966, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       952, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       953, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       954, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       955, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       956, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       957, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       978, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       985, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       986, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       987, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       988, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       989, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       990, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1502, /* GL_PROGRAM_BINDING_ARB */
-       992, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       993, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       979, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       980, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       981, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       982, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       983, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       984, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2068, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2065, /* GL_TEXTURE_COMPRESSED */
-      1285, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       314, /* GL_COMPRESSED_TEXTURE_FORMATS */
-      1184, /* GL_MAX_VERTEX_UNITS_ARB */
+       820, /* GL_INTERPOLATE */
+       322, /* GL_CONSTANT */
+      1503, /* GL_PRIMARY_COLOR */
+      1500, /* GL_PREVIOUS */
+      1877, /* GL_SOURCE0_RGB */
+      1883, /* GL_SOURCE1_RGB */
+      1889, /* GL_SOURCE2_RGB */
+      1893, /* GL_SOURCE3_RGB_NV */
+      1874, /* GL_SOURCE0_ALPHA */
+      1880, /* GL_SOURCE1_ALPHA */
+      1886, /* GL_SOURCE2_ALPHA */
+      1892, /* GL_SOURCE3_ALPHA_NV */
+      1339, /* GL_OPERAND0_RGB */
+      1345, /* GL_OPERAND1_RGB */
+      1351, /* GL_OPERAND2_RGB */
+      1355, /* GL_OPERAND3_RGB_NV */
+      1336, /* GL_OPERAND0_ALPHA */
+      1342, /* GL_OPERAND1_ALPHA */
+      1348, /* GL_OPERAND2_ALPHA */
+      1354, /* GL_OPERAND3_ALPHA_NV */
+       139, /* GL_BUFFER_OBJECT_APPLE */
+      2340, /* GL_VERTEX_ARRAY_BINDING */
+      2203, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2204, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2417, /* GL_YCBCR_422_APPLE */
+      2329, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2331, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2217, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1964, /* GL_STORAGE_PRIVATE_APPLE */
+      1963, /* GL_STORAGE_CACHED_APPLE */
+      1965, /* GL_STORAGE_SHARED_APPLE */
+      1864, /* GL_SLICE_ACCUM_SUN */
+      1582, /* GL_QUAD_MESH_SUN */
+      2264, /* GL_TRIANGLE_MESH_SUN */
+      2382, /* GL_VERTEX_PROGRAM_ARB */
+      2393, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2367, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2375, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2377, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2379, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       393, /* GL_CURRENT_VERTEX_ATTRIB */
+      1527, /* GL_PROGRAM_LENGTH_ARB */
+      1543, /* GL_PROGRAM_STRING_ARB */
+      1259, /* GL_MODELVIEW_PROJECTION_NV */
+       774, /* GL_IDENTITY_NV */
+       853, /* GL_INVERSE_NV */
+      2255, /* GL_TRANSPOSE_NV */
+       854, /* GL_INVERSE_TRANSPOSE_NV */
+      1141, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+      1140, /* GL_MAX_PROGRAM_MATRICES_ARB */
+      1018, /* GL_MATRIX0_NV */
+      1030, /* GL_MATRIX1_NV */
+      1042, /* GL_MATRIX2_NV */
+      1046, /* GL_MATRIX3_NV */
+      1048, /* GL_MATRIX4_NV */
+      1050, /* GL_MATRIX5_NV */
+      1052, /* GL_MATRIX6_NV */
+      1054, /* GL_MATRIX7_NV */
+       376, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       373, /* GL_CURRENT_MATRIX_ARB */
+      1540, /* GL_PROGRAM_POINT_SIZE */
+      2388, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1539, /* GL_PROGRAM_PARAMETER_NV */
+      2373, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1545, /* GL_PROGRAM_TARGET_NV */
+      1542, /* GL_PROGRAM_RESIDENT_NV */
+      2227, /* GL_TRACK_MATRIX_NV */
+      2228, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2383, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1521, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       439, /* GL_DEPTH_CLAMP */
+      2348, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2355, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2356, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2357, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2358, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2359, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2360, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2361, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2362, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2363, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2349, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2350, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2351, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2352, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2353, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2354, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       966, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       973, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       974, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       975, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       976, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       977, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       978, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       979, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       980, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       981, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       967, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       968, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       969, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       970, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       971, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       972, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       993, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+      1000, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+      1001, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+      1002, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+      1003, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+      1004, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+      1005, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1520, /* GL_PROGRAM_BINDING_ARB */
+      1007, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+      1008, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       994, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       995, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       996, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       997, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       998, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       999, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      2117, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2114, /* GL_TEXTURE_COMPRESSED */
+      1301, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       320, /* GL_COMPRESSED_TEXTURE_FORMATS */
+      1200, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2351, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2321, /* GL_VERTEX_BLEND_ARB */
-       389, /* GL_CURRENT_WEIGHT_ARB */
-      2349, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2347, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2345, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2343, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2338, /* GL_WEIGHT_ARRAY_ARB */
-       466, /* GL_DOT3_RGB */
-       467, /* GL_DOT3_RGBA */
-       308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1251, /* GL_MULTISAMPLE_3DFX */
-      1778, /* GL_SAMPLE_BUFFERS_3DFX */
-      1769, /* GL_SAMPLES_3DFX */
-      1231, /* GL_MODELVIEW2_ARB */
-      1234, /* GL_MODELVIEW3_ARB */
-      1235, /* GL_MODELVIEW4_ARB */
-      1236, /* GL_MODELVIEW5_ARB */
-      1237, /* GL_MODELVIEW6_ARB */
-      1238, /* GL_MODELVIEW7_ARB */
-      1239, /* GL_MODELVIEW8_ARB */
-      1240, /* GL_MODELVIEW9_ARB */
-      1210, /* GL_MODELVIEW10_ARB */
-      1211, /* GL_MODELVIEW11_ARB */
-      1212, /* GL_MODELVIEW12_ARB */
-      1213, /* GL_MODELVIEW13_ARB */
-      1214, /* GL_MODELVIEW14_ARB */
-      1215, /* GL_MODELVIEW15_ARB */
-      1216, /* GL_MODELVIEW16_ARB */
-      1217, /* GL_MODELVIEW17_ARB */
-      1218, /* GL_MODELVIEW18_ARB */
-      1219, /* GL_MODELVIEW19_ARB */
-      1221, /* GL_MODELVIEW20_ARB */
-      1222, /* GL_MODELVIEW21_ARB */
-      1223, /* GL_MODELVIEW22_ARB */
-      1224, /* GL_MODELVIEW23_ARB */
-      1225, /* GL_MODELVIEW24_ARB */
-      1226, /* GL_MODELVIEW25_ARB */
-      1227, /* GL_MODELVIEW26_ARB */
-      1228, /* GL_MODELVIEW27_ARB */
-      1229, /* GL_MODELVIEW28_ARB */
-      1230, /* GL_MODELVIEW29_ARB */
-      1232, /* GL_MODELVIEW30_ARB */
-      1233, /* GL_MODELVIEW31_ARB */
-       471, /* GL_DOT3_RGB_EXT */
-      1499, /* GL_PROGRAM_BINARY_LENGTH */
-      1204, /* GL_MIRROR_CLAMP_EXT */
-      1207, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1246, /* GL_MODULATE_ADD_ATI */
-      1247, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1248, /* GL_MODULATE_SUBTRACT_ATI */
-      2358, /* GL_YCBCR_MESA */
-      1345, /* GL_PACK_INVERT_MESA */
-       396, /* GL_DEBUG_OBJECT_MESA */
-       398, /* GL_DEBUG_PRINT_MESA */
-       391, /* GL_DEBUG_ASSERT_MESA */
-       139, /* GL_BUFFER_SIZE */
-       141, /* GL_BUFFER_USAGE */
-       145, /* GL_BUMP_ROT_MATRIX_ATI */
-       146, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       144, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       148, /* GL_BUMP_TEX_UNITS_ATI */
-       547, /* GL_DUDV_ATI */
-       546, /* GL_DU8DV8_ATI */
-       143, /* GL_BUMP_ENVMAP_ATI */
-       147, /* GL_BUMP_TARGET_ATI */
-      1288, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-      1497, /* GL_PROGRAM_BINARY_FORMATS */
-      1882, /* GL_STENCIL_BACK_FUNC */
-      1880, /* GL_STENCIL_BACK_FAIL */
-      1884, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1886, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       637, /* GL_FRAGMENT_PROGRAM_ARB */
-      1495, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1530, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1529, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1512, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1518, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1517, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1114, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1138, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1137, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1127, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1133, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1132, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1709, /* GL_RGBA32F */
-      1672, /* GL_RGB32F */
-      1700, /* GL_RGBA16F */
-      1664, /* GL_RGB16F */
-      1728, /* GL_RGBA_FLOAT_MODE_ARB */
-      1082, /* GL_MAX_DRAW_BUFFERS */
-       475, /* GL_DRAW_BUFFER0 */
-       479, /* GL_DRAW_BUFFER1 */
-       507, /* GL_DRAW_BUFFER2 */
-       511, /* GL_DRAW_BUFFER3 */
-       515, /* GL_DRAW_BUFFER4 */
-       519, /* GL_DRAW_BUFFER5 */
-       523, /* GL_DRAW_BUFFER6 */
-       527, /* GL_DRAW_BUFFER7 */
-       531, /* GL_DRAW_BUFFER8 */
-       535, /* GL_DRAW_BUFFER9 */
-       480, /* GL_DRAW_BUFFER10 */
-       484, /* GL_DRAW_BUFFER11 */
-       488, /* GL_DRAW_BUFFER12 */
-       492, /* GL_DRAW_BUFFER13 */
-       496, /* GL_DRAW_BUFFER14 */
-       500, /* GL_DRAW_BUFFER15 */
-        97, /* GL_BLEND_EQUATION_ALPHA */
-      1054, /* GL_MATRIX_PALETTE_ARB */
-      1107, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-      1110, /* GL_MAX_PALETTE_MATRICES_ARB */
-       373, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-      1042, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       368, /* GL_CURRENT_MATRIX_INDEX_ARB */
-      1047, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-      1051, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-      1049, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-      1045, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2103, /* GL_TEXTURE_DEPTH_SIZE */
-       459, /* GL_DEPTH_TEXTURE_MODE */
-      2060, /* GL_TEXTURE_COMPARE_MODE */
-      2058, /* GL_TEXTURE_COMPARE_FUNC */
-       284, /* GL_COMPARE_REF_TO_TEXTURE */
-      2101, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-      1422, /* GL_POINT_SPRITE */
-       347, /* GL_COORD_REPLACE */
-      1427, /* GL_POINT_SPRITE_R_MODE_NV */
-      1570, /* GL_QUERY_COUNTER_BITS */
-       376, /* GL_CURRENT_QUERY */
-      1574, /* GL_QUERY_RESULT */
-      1576, /* GL_QUERY_RESULT_AVAILABLE */
-      1176, /* GL_MAX_VERTEX_ATTRIBS */
-      2311, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       457, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       456, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-      1153, /* GL_MAX_TEXTURE_COORDS */
-      1155, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1505, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1507, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1506, /* GL_PROGRAM_FORMAT_ARB */
-      2160, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       429, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       428, /* GL_DEPTH_BOUNDS_EXT */
-        61, /* GL_ARRAY_BUFFER */
-       560, /* GL_ELEMENT_ARRAY_BUFFER */
-        62, /* GL_ARRAY_BUFFER_BINDING */
-       561, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2282, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1273, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       776, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2073, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       556, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1790, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       615, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2339, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2304, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1508, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-      1120, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1514, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1129, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1528, /* GL_PROGRAM_TEMPORARIES_ARB */
-      1135, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1516, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1131, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1520, /* GL_PROGRAM_PARAMETERS_ARB */
-      1134, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1515, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1130, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1496, /* GL_PROGRAM_ATTRIBS_ARB */
-      1115, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1513, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1128, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1494, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1113, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1511, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-      1126, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-      1121, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-      1117, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1531, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2193, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1593, /* GL_READ_ONLY */
-      2353, /* GL_WRITE_ONLY */
-      1595, /* GL_READ_WRITE */
-       124, /* GL_BUFFER_ACCESS */
-       129, /* GL_BUFFER_MAPPED */
-       134, /* GL_BUFFER_MAP_POINTER */
-      2167, /* GL_TIME_ELAPSED_EXT */
-      1002, /* GL_MATRIX0_ARB */
-      1014, /* GL_MATRIX1_ARB */
-      1026, /* GL_MATRIX2_ARB */
-      1030, /* GL_MATRIX3_ARB */
-      1032, /* GL_MATRIX4_ARB */
-      1034, /* GL_MATRIX5_ARB */
-      1036, /* GL_MATRIX6_ARB */
-      1038, /* GL_MATRIX7_ARB */
-      1040, /* GL_MATRIX8_ARB */
-      1041, /* GL_MATRIX9_ARB */
-      1004, /* GL_MATRIX10_ARB */
-      1005, /* GL_MATRIX11_ARB */
-      1006, /* GL_MATRIX12_ARB */
-      1007, /* GL_MATRIX13_ARB */
-      1008, /* GL_MATRIX14_ARB */
-      1009, /* GL_MATRIX15_ARB */
-      1010, /* GL_MATRIX16_ARB */
-      1011, /* GL_MATRIX17_ARB */
-      1012, /* GL_MATRIX18_ARB */
-      1013, /* GL_MATRIX19_ARB */
-      1016, /* GL_MATRIX20_ARB */
-      1017, /* GL_MATRIX21_ARB */
-      1018, /* GL_MATRIX22_ARB */
-      1019, /* GL_MATRIX23_ARB */
-      1020, /* GL_MATRIX24_ARB */
-      1021, /* GL_MATRIX25_ARB */
-      1022, /* GL_MATRIX26_ARB */
-      1023, /* GL_MATRIX27_ARB */
-      1024, /* GL_MATRIX28_ARB */
-      1025, /* GL_MATRIX29_ARB */
-      1028, /* GL_MATRIX30_ARB */
-      1029, /* GL_MATRIX31_ARB */
-      1923, /* GL_STREAM_DRAW */
-      1925, /* GL_STREAM_READ */
-      1921, /* GL_STREAM_COPY */
-      1872, /* GL_STATIC_DRAW */
-      1874, /* GL_STATIC_READ */
-      1870, /* GL_STATIC_COPY */
-       550, /* GL_DYNAMIC_DRAW */
-       552, /* GL_DYNAMIC_READ */
-       548, /* GL_DYNAMIC_COPY */
-      1385, /* GL_PIXEL_PACK_BUFFER */
-      1389, /* GL_PIXEL_UNPACK_BUFFER */
-      1386, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1390, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       420, /* GL_DEPTH24_STENCIL8 */
-      2156, /* GL_TEXTURE_STENCIL_SIZE */
-      1118, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-      1116, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-      1119, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-      1123, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-      1122, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2309, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2306, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-      1059, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-      1199, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-      1136, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1914, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      2411, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2381, /* GL_VERTEX_BLEND_ARB */
+       395, /* GL_CURRENT_WEIGHT_ARB */
+      2409, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2407, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2405, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2403, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2398, /* GL_WEIGHT_ARRAY_ARB */
+       474, /* GL_DOT3_RGB */
+       475, /* GL_DOT3_RGBA */
+       311, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       306, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+      1267, /* GL_MULTISAMPLE_3DFX */
+      1822, /* GL_SAMPLE_BUFFERS_3DFX */
+      1813, /* GL_SAMPLES_3DFX */
+      1247, /* GL_MODELVIEW2_ARB */
+      1250, /* GL_MODELVIEW3_ARB */
+      1251, /* GL_MODELVIEW4_ARB */
+      1252, /* GL_MODELVIEW5_ARB */
+      1253, /* GL_MODELVIEW6_ARB */
+      1254, /* GL_MODELVIEW7_ARB */
+      1255, /* GL_MODELVIEW8_ARB */
+      1256, /* GL_MODELVIEW9_ARB */
+      1226, /* GL_MODELVIEW10_ARB */
+      1227, /* GL_MODELVIEW11_ARB */
+      1228, /* GL_MODELVIEW12_ARB */
+      1229, /* GL_MODELVIEW13_ARB */
+      1230, /* GL_MODELVIEW14_ARB */
+      1231, /* GL_MODELVIEW15_ARB */
+      1232, /* GL_MODELVIEW16_ARB */
+      1233, /* GL_MODELVIEW17_ARB */
+      1234, /* GL_MODELVIEW18_ARB */
+      1235, /* GL_MODELVIEW19_ARB */
+      1237, /* GL_MODELVIEW20_ARB */
+      1238, /* GL_MODELVIEW21_ARB */
+      1239, /* GL_MODELVIEW22_ARB */
+      1240, /* GL_MODELVIEW23_ARB */
+      1241, /* GL_MODELVIEW24_ARB */
+      1242, /* GL_MODELVIEW25_ARB */
+      1243, /* GL_MODELVIEW26_ARB */
+      1244, /* GL_MODELVIEW27_ARB */
+      1245, /* GL_MODELVIEW28_ARB */
+      1246, /* GL_MODELVIEW29_ARB */
+      1248, /* GL_MODELVIEW30_ARB */
+      1249, /* GL_MODELVIEW31_ARB */
+       479, /* GL_DOT3_RGB_EXT */
+      1517, /* GL_PROGRAM_BINARY_LENGTH */
+      1220, /* GL_MIRROR_CLAMP_EXT */
+      1223, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1262, /* GL_MODULATE_ADD_ATI */
+      1263, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1264, /* GL_MODULATE_SUBTRACT_ATI */
+      2418, /* GL_YCBCR_MESA */
+      1363, /* GL_PACK_INVERT_MESA */
+       402, /* GL_DEBUG_OBJECT_MESA */
+       404, /* GL_DEBUG_PRINT_MESA */
+       397, /* GL_DEBUG_ASSERT_MESA */
+       141, /* GL_BUFFER_SIZE */
+       143, /* GL_BUFFER_USAGE */
+       147, /* GL_BUMP_ROT_MATRIX_ATI */
+       148, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       146, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       150, /* GL_BUMP_TEX_UNITS_ATI */
+       555, /* GL_DUDV_ATI */
+       554, /* GL_DU8DV8_ATI */
+       145, /* GL_BUMP_ENVMAP_ATI */
+       149, /* GL_BUMP_TARGET_ATI */
+      1304, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+      1515, /* GL_PROGRAM_BINARY_FORMATS */
+      1927, /* GL_STENCIL_BACK_FUNC */
+      1925, /* GL_STENCIL_BACK_FAIL */
+      1929, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1931, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       646, /* GL_FRAGMENT_PROGRAM_ARB */
+      1513, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1548, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1547, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1530, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1536, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1535, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1130, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1154, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1153, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1143, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1149, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1148, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1751, /* GL_RGBA32F */
+      1712, /* GL_RGB32F */
+        40, /* GL_ALPHA32F_ARB */
+       808, /* GL_INTENSITY32F_ARB */
+       928, /* GL_LUMINANCE32F_ARB */
+       947, /* GL_LUMINANCE_ALPHA32F_ARB */
+      1741, /* GL_RGBA16F */
+      1703, /* GL_RGB16F */
+        36, /* GL_ALPHA16F_ARB */
+       804, /* GL_INTENSITY16F_ARB */
+       922, /* GL_LUMINANCE16F_ARB */
+       944, /* GL_LUMINANCE_ALPHA16F_ARB */
+      1771, /* GL_RGBA_FLOAT_MODE_ARB */
+      1097, /* GL_MAX_DRAW_BUFFERS */
+       483, /* GL_DRAW_BUFFER0 */
+       487, /* GL_DRAW_BUFFER1 */
+       515, /* GL_DRAW_BUFFER2 */
+       519, /* GL_DRAW_BUFFER3 */
+       523, /* GL_DRAW_BUFFER4 */
+       527, /* GL_DRAW_BUFFER5 */
+       531, /* GL_DRAW_BUFFER6 */
+       535, /* GL_DRAW_BUFFER7 */
+       539, /* GL_DRAW_BUFFER8 */
+       543, /* GL_DRAW_BUFFER9 */
+       488, /* GL_DRAW_BUFFER10 */
+       492, /* GL_DRAW_BUFFER11 */
+       496, /* GL_DRAW_BUFFER12 */
+       500, /* GL_DRAW_BUFFER13 */
+       504, /* GL_DRAW_BUFFER14 */
+       508, /* GL_DRAW_BUFFER15 */
+        99, /* GL_BLEND_EQUATION_ALPHA */
+      1069, /* GL_MATRIX_PALETTE_ARB */
+      1123, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+      1126, /* GL_MAX_PALETTE_MATRICES_ARB */
+       379, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+      1057, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       374, /* GL_CURRENT_MATRIX_INDEX_ARB */
+      1062, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+      1066, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+      1064, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+      1060, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      2152, /* GL_TEXTURE_DEPTH_SIZE */
+       467, /* GL_DEPTH_TEXTURE_MODE */
+      2109, /* GL_TEXTURE_COMPARE_MODE */
+      2107, /* GL_TEXTURE_COMPARE_FUNC */
+       286, /* GL_COMPARE_REF_TO_TEXTURE */
+      2150, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      1440, /* GL_POINT_SPRITE */
+       353, /* GL_COORD_REPLACE */
+      1445, /* GL_POINT_SPRITE_R_MODE_NV */
+      1588, /* GL_QUERY_COUNTER_BITS */
+       382, /* GL_CURRENT_QUERY */
+      1592, /* GL_QUERY_RESULT */
+      1594, /* GL_QUERY_RESULT_AVAILABLE */
+      1192, /* GL_MAX_VERTEX_ATTRIBS */
+      2371, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       465, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       464, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+      1169, /* GL_MAX_TEXTURE_COORDS */
+      1171, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1523, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1525, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1524, /* GL_PROGRAM_FORMAT_ARB */
+      2219, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       436, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       435, /* GL_DEPTH_BOUNDS_EXT */
+        63, /* GL_ARRAY_BUFFER */
+       568, /* GL_ELEMENT_ARRAY_BUFFER */
+        64, /* GL_ARRAY_BUFFER_BINDING */
+       569, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      2342, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1289, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       192, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       785, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      2122, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       564, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1834, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       624, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      2399, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2364, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1526, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      1136, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1532, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1145, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1546, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1151, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1534, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1147, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1538, /* GL_PROGRAM_PARAMETERS_ARB */
+      1150, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1533, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1146, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1514, /* GL_PROGRAM_ATTRIBS_ARB */
+      1131, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1531, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1144, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1512, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1129, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1529, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1142, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1137, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+      1133, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1549, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      2252, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1621, /* GL_READ_ONLY */
+      2413, /* GL_WRITE_ONLY */
+      1623, /* GL_READ_WRITE */
+       126, /* GL_BUFFER_ACCESS */
+       131, /* GL_BUFFER_MAPPED */
+       136, /* GL_BUFFER_MAP_POINTER */
+      2226, /* GL_TIME_ELAPSED_EXT */
+      1017, /* GL_MATRIX0_ARB */
+      1029, /* GL_MATRIX1_ARB */
+      1041, /* GL_MATRIX2_ARB */
+      1045, /* GL_MATRIX3_ARB */
+      1047, /* GL_MATRIX4_ARB */
+      1049, /* GL_MATRIX5_ARB */
+      1051, /* GL_MATRIX6_ARB */
+      1053, /* GL_MATRIX7_ARB */
+      1055, /* GL_MATRIX8_ARB */
+      1056, /* GL_MATRIX9_ARB */
+      1019, /* GL_MATRIX10_ARB */
+      1020, /* GL_MATRIX11_ARB */
+      1021, /* GL_MATRIX12_ARB */
+      1022, /* GL_MATRIX13_ARB */
+      1023, /* GL_MATRIX14_ARB */
+      1024, /* GL_MATRIX15_ARB */
+      1025, /* GL_MATRIX16_ARB */
+      1026, /* GL_MATRIX17_ARB */
+      1027, /* GL_MATRIX18_ARB */
+      1028, /* GL_MATRIX19_ARB */
+      1031, /* GL_MATRIX20_ARB */
+      1032, /* GL_MATRIX21_ARB */
+      1033, /* GL_MATRIX22_ARB */
+      1034, /* GL_MATRIX23_ARB */
+      1035, /* GL_MATRIX24_ARB */
+      1036, /* GL_MATRIX25_ARB */
+      1037, /* GL_MATRIX26_ARB */
+      1038, /* GL_MATRIX27_ARB */
+      1039, /* GL_MATRIX28_ARB */
+      1040, /* GL_MATRIX29_ARB */
+      1043, /* GL_MATRIX30_ARB */
+      1044, /* GL_MATRIX31_ARB */
+      1968, /* GL_STREAM_DRAW */
+      1970, /* GL_STREAM_READ */
+      1966, /* GL_STREAM_COPY */
+      1917, /* GL_STATIC_DRAW */
+      1919, /* GL_STATIC_READ */
+      1915, /* GL_STATIC_COPY */
+       558, /* GL_DYNAMIC_DRAW */
+       560, /* GL_DYNAMIC_READ */
+       556, /* GL_DYNAMIC_COPY */
+      1403, /* GL_PIXEL_PACK_BUFFER */
+      1407, /* GL_PIXEL_UNPACK_BUFFER */
+      1404, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1408, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       426, /* GL_DEPTH24_STENCIL8 */
+      2215, /* GL_TEXTURE_STENCIL_SIZE */
+      1134, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+      1132, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+      1135, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+      1139, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+      1138, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+      1902, /* GL_SRC1_COLOR */
+      1333, /* GL_ONE_MINUS_SRC1_COLOR */
+      1332, /* GL_ONE_MINUS_SRC1_ALPHA */
+      1101, /* GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
+      2369, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2366, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      1074, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
+      1215, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+      1152, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
+      1959, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
-      1205, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1771, /* GL_SAMPLES_PASSED */
-       730, /* GL_GEOMETRY_VERTICES_OUT */
-       724, /* GL_GEOMETRY_INPUT_TYPE */
-       726, /* GL_GEOMETRY_OUTPUT_TYPE */
-      1761, /* GL_SAMPLER_BINDING */
-       164, /* GL_CLAMP_VERTEX_COLOR_ARB */
-       156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
-       157, /* GL_CLAMP_READ_COLOR */
-       587, /* GL_FIXED_ONLY */
-      1409, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1408, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1407, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-      1242, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1534, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2136, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-       138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-       128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1610, /* GL_RELEASED_APPLE */
-      2336, /* GL_VOLATILE_APPLE */
-      1651, /* GL_RETAINED_APPLE */
-      2210, /* GL_UNDEFINED_APPLE */
-      1558, /* GL_PURGEABLE_APPLE */
-       638, /* GL_FRAGMENT_SHADER */
-      2331, /* GL_VERTEX_SHADER */
-      1519, /* GL_PROGRAM_OBJECT_ARB */
-      1807, /* GL_SHADER_OBJECT_ARB */
-      1091, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-      1181, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-      1172, /* GL_MAX_VARYING_COMPONENTS */
-      1179, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-      1071, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1305, /* GL_OBJECT_TYPE_ARB */
-      1809, /* GL_SHADER_TYPE */
-       603, /* GL_FLOAT_VEC2 */
-       605, /* GL_FLOAT_VEC3 */
-       607, /* GL_FLOAT_VEC4 */
-       830, /* GL_INT_VEC2 */
-       832, /* GL_INT_VEC3 */
-       834, /* GL_INT_VEC4 */
-       116, /* GL_BOOL */
-       118, /* GL_BOOL_VEC2 */
-       120, /* GL_BOOL_VEC3 */
-       122, /* GL_BOOL_VEC4 */
-       591, /* GL_FLOAT_MAT2 */
-       595, /* GL_FLOAT_MAT3 */
-       599, /* GL_FLOAT_MAT4 */
-      1745, /* GL_SAMPLER_1D */
-      1751, /* GL_SAMPLER_2D */
-      1759, /* GL_SAMPLER_3D */
-      1764, /* GL_SAMPLER_CUBE */
-      1750, /* GL_SAMPLER_1D_SHADOW */
-      1758, /* GL_SAMPLER_2D_SHADOW */
-      1756, /* GL_SAMPLER_2D_RECT */
-      1757, /* GL_SAMPLER_2D_RECT_SHADOW */
-       593, /* GL_FLOAT_MAT2x3 */
-       594, /* GL_FLOAT_MAT2x4 */
-       597, /* GL_FLOAT_MAT3x2 */
-       598, /* GL_FLOAT_MAT3x4 */
-       601, /* GL_FLOAT_MAT4x2 */
-       602, /* GL_FLOAT_MAT4x3 */
-       418, /* GL_DELETE_STATUS */
-       289, /* GL_COMPILE_STATUS */
-       891, /* GL_LINK_STATUS */
-      2276, /* GL_VALIDATE_STATUS */
-       788, /* GL_INFO_LOG_LENGTH */
-        64, /* GL_ATTACHED_SHADERS */
+      1221, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1815, /* GL_SAMPLES_PASSED */
+       739, /* GL_GEOMETRY_VERTICES_OUT */
+       733, /* GL_GEOMETRY_INPUT_TYPE */
+       735, /* GL_GEOMETRY_OUTPUT_TYPE */
+      1805, /* GL_SAMPLER_BINDING */
+       166, /* GL_CLAMP_VERTEX_COLOR_ARB */
+       158, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
+       159, /* GL_CLAMP_READ_COLOR */
+       595, /* GL_FIXED_ONLY */
+      1427, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1426, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1425, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1258, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1552, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2193, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+       140, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+       130, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+      1638, /* GL_RELEASED_APPLE */
+      2396, /* GL_VOLATILE_APPLE */
+      1679, /* GL_RETAINED_APPLE */
+      2269, /* GL_UNDEFINED_APPLE */
+      1576, /* GL_PURGEABLE_APPLE */
+       647, /* GL_FRAGMENT_SHADER */
+      2391, /* GL_VERTEX_SHADER */
+      1537, /* GL_PROGRAM_OBJECT_ARB */
+      1851, /* GL_SHADER_OBJECT_ARB */
+      1107, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+      1197, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+      1188, /* GL_MAX_VARYING_COMPONENTS */
+      1195, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+      1086, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1321, /* GL_OBJECT_TYPE_ARB */
+      1853, /* GL_SHADER_TYPE */
+       612, /* GL_FLOAT_VEC2 */
+       614, /* GL_FLOAT_VEC3 */
+       616, /* GL_FLOAT_VEC4 */
+       841, /* GL_INT_VEC2 */
+       843, /* GL_INT_VEC3 */
+       845, /* GL_INT_VEC4 */
+       118, /* GL_BOOL */
+       120, /* GL_BOOL_VEC2 */
+       122, /* GL_BOOL_VEC3 */
+       124, /* GL_BOOL_VEC4 */
+       600, /* GL_FLOAT_MAT2 */
+       604, /* GL_FLOAT_MAT3 */
+       608, /* GL_FLOAT_MAT4 */
+      1789, /* GL_SAMPLER_1D */
+      1795, /* GL_SAMPLER_2D */
+      1803, /* GL_SAMPLER_3D */
+      1808, /* GL_SAMPLER_CUBE */
+      1794, /* GL_SAMPLER_1D_SHADOW */
+      1802, /* GL_SAMPLER_2D_SHADOW */
+      1800, /* GL_SAMPLER_2D_RECT */
+      1801, /* GL_SAMPLER_2D_RECT_SHADOW */
+       602, /* GL_FLOAT_MAT2x3 */
+       603, /* GL_FLOAT_MAT2x4 */
+       606, /* GL_FLOAT_MAT3x2 */
+       607, /* GL_FLOAT_MAT3x4 */
+       610, /* GL_FLOAT_MAT4x2 */
+       611, /* GL_FLOAT_MAT4x3 */
+       424, /* GL_DELETE_STATUS */
+       291, /* GL_COMPILE_STATUS */
+       902, /* GL_LINK_STATUS */
+      2336, /* GL_VALIDATE_STATUS */
+       797, /* GL_INFO_LOG_LENGTH */
+        66, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1808, /* GL_SHADER_SOURCE_LENGTH */
+      1852, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       640, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1811, /* GL_SHADING_LANGUAGE_VERSION */
-       375, /* GL_CURRENT_PROGRAM */
-      1354, /* GL_PALETTE4_RGB8_OES */
-      1356, /* GL_PALETTE4_RGBA8_OES */
-      1352, /* GL_PALETTE4_R5_G6_B5_OES */
-      1355, /* GL_PALETTE4_RGBA4_OES */
-      1353, /* GL_PALETTE4_RGB5_A1_OES */
-      1359, /* GL_PALETTE8_RGB8_OES */
-      1361, /* GL_PALETTE8_RGBA8_OES */
-      1357, /* GL_PALETTE8_R5_G6_B5_OES */
-      1360, /* GL_PALETTE8_RGBA4_OES */
-      1358, /* GL_PALETTE8_RGB5_A1_OES */
-       769, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-       767, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-      1406, /* GL_POINT_SIZE_ARRAY_OES */
-      2079, /* GL_TEXTURE_CROP_RECT_OES */
-      1043, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1405, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2259, /* GL_UNSIGNED_NORMALIZED */
-      2011, /* GL_TEXTURE_1D_ARRAY */
-      1544, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      2014, /* GL_TEXTURE_2D_ARRAY */
-      1548, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      2022, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      2025, /* GL_TEXTURE_BINDING_2D_ARRAY */
-      1098, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      2043, /* GL_TEXTURE_BUFFER */
-      1151, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      2029, /* GL_TEXTURE_BINDING_BUFFER */
-      2045, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      2047, /* GL_TEXTURE_BUFFER_FORMAT */
-      1581, /* GL_R11F_G11F_B10F */
-      2225, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-      1695, /* GL_RGB9_E5 */
-      2234, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2154, /* GL_TEXTURE_SHARED_SIZE */
-      1864, /* GL_SRGB */
-      1865, /* GL_SRGB8 */
-      1867, /* GL_SRGB_ALPHA */
-      1866, /* GL_SRGB8_ALPHA8 */
-      1824, /* GL_SLUMINANCE_ALPHA */
-      1823, /* GL_SLUMINANCE8_ALPHA8 */
-      1821, /* GL_SLUMINANCE */
-      1822, /* GL_SLUMINANCE8 */
-       312, /* GL_COMPRESSED_SRGB */
-       313, /* GL_COMPRESSED_SRGB_ALPHA */
-       310, /* GL_COMPRESSED_SLUMINANCE */
-       311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2189, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2178, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-      1170, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2187, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2183, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2181, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-      1488, /* GL_PRIMITIVES_GENERATED */
-      2185, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-      1585, /* GL_RASTERIZER_DISCARD */
-      1166, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-      1168, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-       807, /* GL_INTERLEAVED_ATTRIBS */
-      1800, /* GL_SEPARATE_ATTRIBS */
-      2173, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2175, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-      1424, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       900, /* GL_LOWER_LEFT */
-      2273, /* GL_UPPER_LEFT */
-      1888, /* GL_STENCIL_BACK_REF */
-      1889, /* GL_STENCIL_BACK_VALUE_MASK */
-      1890, /* GL_STENCIL_BACK_WRITEMASK */
-       540, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1615, /* GL_RENDERBUFFER_BINDING */
-      1589, /* GL_READ_FRAMEBUFFER */
-       539, /* GL_DRAW_FRAMEBUFFER */
-      1590, /* GL_READ_FRAMEBUFFER_BINDING */
-      1634, /* GL_RENDERBUFFER_SAMPLES */
-       654, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       651, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       666, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       661, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       664, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       672, /* GL_FRAMEBUFFER_COMPLETE */
-       677, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       692, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       686, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       681, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       687, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       683, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-       697, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-       703, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       701, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-      1067, /* GL_MAX_COLOR_ATTACHMENTS */
-       196, /* GL_COLOR_ATTACHMENT0 */
-       199, /* GL_COLOR_ATTACHMENT1 */
-       213, /* GL_COLOR_ATTACHMENT2 */
-       215, /* GL_COLOR_ATTACHMENT3 */
-       217, /* GL_COLOR_ATTACHMENT4 */
-       219, /* GL_COLOR_ATTACHMENT5 */
-       221, /* GL_COLOR_ATTACHMENT6 */
-       223, /* GL_COLOR_ATTACHMENT7 */
-       225, /* GL_COLOR_ATTACHMENT8 */
-       227, /* GL_COLOR_ATTACHMENT9 */
-       200, /* GL_COLOR_ATTACHMENT10 */
-       202, /* GL_COLOR_ATTACHMENT11 */
-       204, /* GL_COLOR_ATTACHMENT12 */
-       206, /* GL_COLOR_ATTACHMENT13 */
-       208, /* GL_COLOR_ATTACHMENT14 */
-       210, /* GL_COLOR_ATTACHMENT15 */
-       423, /* GL_DEPTH_ATTACHMENT */
-      1877, /* GL_STENCIL_ATTACHMENT */
-       642, /* GL_FRAMEBUFFER */
-      1612, /* GL_RENDERBUFFER */
-      1638, /* GL_RENDERBUFFER_WIDTH */
-      1625, /* GL_RENDERBUFFER_HEIGHT */
-      1628, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1909, /* GL_STENCIL_INDEX_EXT */
-      1898, /* GL_STENCIL_INDEX1 */
-      1903, /* GL_STENCIL_INDEX4 */
-      1906, /* GL_STENCIL_INDEX8 */
-      1899, /* GL_STENCIL_INDEX16 */
-      1632, /* GL_RENDERBUFFER_RED_SIZE */
-      1623, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1618, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1613, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1620, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1636, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       695, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-      1146, /* GL_MAX_SAMPLES */
-      2116, /* GL_TEXTURE_GEN_STR_OES */
-       743, /* GL_HALF_FLOAT_OES */
-      1681, /* GL_RGB565 */
-       567, /* GL_ETC1_RGB8_OES */
-      2108, /* GL_TEXTURE_EXTERNAL_OES */
-      1767, /* GL_SAMPLER_EXTERNAL_OES */
-      2034, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-      1647, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-      1712, /* GL_RGBA32UI */
-      1675, /* GL_RGB32UI */
-        40, /* GL_ALPHA32UI_EXT */
-       799, /* GL_INTENSITY32UI_EXT */
-       917, /* GL_LUMINANCE32UI_EXT */
-       934, /* GL_LUMINANCE_ALPHA32UI_EXT */
-      1703, /* GL_RGBA16UI */
-      1667, /* GL_RGB16UI */
-        37, /* GL_ALPHA16UI_EXT */
-       796, /* GL_INTENSITY16UI_EXT */
-       912, /* GL_LUMINANCE16UI_EXT */
-       932, /* GL_LUMINANCE_ALPHA16UI_EXT */
-      1722, /* GL_RGBA8UI */
-      1690, /* GL_RGB8UI */
-        45, /* GL_ALPHA8UI_EXT */
-       804, /* GL_INTENSITY8UI_EXT */
-       926, /* GL_LUMINANCE8UI_EXT */
-       936, /* GL_LUMINANCE_ALPHA8UI_EXT */
-      1710, /* GL_RGBA32I */
-      1673, /* GL_RGB32I */
-        39, /* GL_ALPHA32I_EXT */
-       798, /* GL_INTENSITY32I_EXT */
-       916, /* GL_LUMINANCE32I_EXT */
-       933, /* GL_LUMINANCE_ALPHA32I_EXT */
-      1701, /* GL_RGBA16I */
-      1665, /* GL_RGB16I */
-        36, /* GL_ALPHA16I_EXT */
-       795, /* GL_INTENSITY16I_EXT */
-       911, /* GL_LUMINANCE16I_EXT */
-       931, /* GL_LUMINANCE_ALPHA16I_EXT */
-      1720, /* GL_RGBA8I */
-      1688, /* GL_RGB8I */
-        44, /* GL_ALPHA8I_EXT */
-       803, /* GL_INTENSITY8I_EXT */
-       925, /* GL_LUMINANCE8I_EXT */
-       935, /* GL_LUMINANCE_ALPHA8I_EXT */
-      1602, /* GL_RED_INTEGER */
-       738, /* GL_GREEN_INTEGER */
-       113, /* GL_BLUE_INTEGER */
-        49, /* GL_ALPHA_INTEGER_EXT */
-      1735, /* GL_RGB_INTEGER */
-      1729, /* GL_RGBA_INTEGER */
-        84, /* GL_BGR_INTEGER */
-        82, /* GL_BGRA_INTEGER */
-       938, /* GL_LUMINANCE_INTEGER_EXT */
-       937, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-      1731, /* GL_RGBA_INTEGER_MODE_EXT */
-       813, /* GL_INT_2_10_10_10_REV */
-       649, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
-       690, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
-       689, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-      1746, /* GL_SAMPLER_1D_ARRAY */
-      1752, /* GL_SAMPLER_2D_ARRAY */
-      1762, /* GL_SAMPLER_BUFFER */
-      1748, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-      1754, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1765, /* GL_SAMPLER_CUBE_SHADOW */
-      2253, /* GL_UNSIGNED_INT_VEC2 */
-      2255, /* GL_UNSIGNED_INT_VEC3 */
-      2257, /* GL_UNSIGNED_INT_VEC4 */
-       814, /* GL_INT_SAMPLER_1D */
-       818, /* GL_INT_SAMPLER_2D */
-       824, /* GL_INT_SAMPLER_3D */
-       828, /* GL_INT_SAMPLER_CUBE */
-       822, /* GL_INT_SAMPLER_2D_RECT */
-       815, /* GL_INT_SAMPLER_1D_ARRAY */
-       819, /* GL_INT_SAMPLER_2D_ARRAY */
-       826, /* GL_INT_SAMPLER_BUFFER */
-      2237, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2241, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2247, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2251, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2245, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2238, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2242, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2249, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-       728, /* GL_GEOMETRY_SHADER */
-       731, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-       725, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-       727, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-      1104, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-      1186, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-      1102, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
-      1096, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
-      1100, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
-       901, /* GL_LOW_FLOAT */
-      1188, /* GL_MEDIUM_FLOAT */
-       744, /* GL_HIGH_FLOAT */
-       902, /* GL_LOW_INT */
-      1189, /* GL_MEDIUM_INT */
-       745, /* GL_HIGH_INT */
-      2227, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-       812, /* GL_INT_10_10_10_2_OES */
-      1805, /* GL_SHADER_BINARY_FORMATS */
-      1290, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1806, /* GL_SHADER_COMPILER */
-      1183, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-      1175, /* GL_MAX_VARYING_VECTORS */
-      1093, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1578, /* GL_QUERY_WAIT */
-      1572, /* GL_QUERY_NO_WAIT */
-      1568, /* GL_QUERY_BY_REGION_WAIT */
-      1566, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2171, /* GL_TRANSFORM_FEEDBACK */
-      2180, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2174, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2172, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1562, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-       583, /* GL_FIRST_VERTEX_CONVENTION */
-       846, /* GL_LAST_VERTEX_CONVENTION */
-      1536, /* GL_PROVOKING_VERTEX */
-       354, /* GL_COPY_READ_BUFFER */
-       355, /* GL_COPY_WRITE_BUFFER */
-      1605, /* GL_RED_SNORM */
-      1742, /* GL_RG_SNORM */
-      1741, /* GL_RGB_SNORM */
-      1734, /* GL_RGBA_SNORM */
-      1584, /* GL_R8_SNORM */
-      1654, /* GL_RG8_SNORM */
-      1694, /* GL_RGB8_SNORM */
-      1726, /* GL_RGBA8_SNORM */
-      1582, /* GL_R16_SNORM */
-      1653, /* GL_RG16_SNORM */
-      1670, /* GL_RGB16_SNORM */
-      1706, /* GL_RGBA16_SNORM */
-      1817, /* GL_SIGNED_NORMALIZED */
-      1490, /* GL_PRIMITIVE_RESTART */
-      1491, /* GL_PRIMITIVE_RESTART_INDEX */
-      1658, /* GL_RGB10_A2UI */
-      1148, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1304, /* GL_OBJECT_TYPE */
-      1930, /* GL_SYNC_CONDITION */
-      1935, /* GL_SYNC_STATUS */
-      1932, /* GL_SYNC_FLAGS */
-      1931, /* GL_SYNC_FENCE */
-      1934, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2220, /* GL_UNSIGNALED */
-      1816, /* GL_SIGNALED */
-        54, /* GL_ALREADY_SIGNALED */
-      2166, /* GL_TIMEOUT_EXPIRED */
-       315, /* GL_CONDITION_SATISFIED */
-      2337, /* GL_WAIT_FAILED */
-       126, /* GL_BUFFER_ACCESS_FLAGS */
-       132, /* GL_BUFFER_MAP_LENGTH */
-       133, /* GL_BUFFER_MAP_OFFSET */
-      1178, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-      1094, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
-      1095, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
-      1090, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
-       330, /* GL_CONTEXT_PROFILE_MASK */
-       733, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
-      1081, /* GL_MAX_DEBUG_MESSAGE_LENGTH_ARB */
-      1080, /* GL_MAX_DEBUG_LOGGED_MESSAGES_ARB */
-       394, /* GL_DEBUG_LOGGED_MESSAGES_ARB */
-       399, /* GL_DEBUG_SEVERITY_HIGH_ARB */
-       401, /* GL_DEBUG_SEVERITY_MEDIUM_ARB */
-       400, /* GL_DEBUG_SEVERITY_LOW_ARB */
-       568, /* GL_EVAL_BIT */
-      1587, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       893, /* GL_LIST_BIT */
-      2038, /* GL_TEXTURE_BIT */
-      1786, /* GL_SCISSOR_BIT */
+       649, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1855, /* GL_SHADING_LANGUAGE_VERSION */
+       381, /* GL_CURRENT_PROGRAM */
+      1372, /* GL_PALETTE4_RGB8_OES */
+      1374, /* GL_PALETTE4_RGBA8_OES */
+      1370, /* GL_PALETTE4_R5_G6_B5_OES */
+      1373, /* GL_PALETTE4_RGBA4_OES */
+      1371, /* GL_PALETTE4_RGB5_A1_OES */
+      1377, /* GL_PALETTE8_RGB8_OES */
+      1379, /* GL_PALETTE8_RGBA8_OES */
+      1375, /* GL_PALETTE8_R5_G6_B5_OES */
+      1378, /* GL_PALETTE8_RGBA4_OES */
+      1376, /* GL_PALETTE8_RGB5_A1_OES */
+       778, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+       776, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+      1424, /* GL_POINT_SIZE_ARRAY_OES */
+      2128, /* GL_TEXTURE_CROP_RECT_OES */
+      1058, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+      1423, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      2210, /* GL_TEXTURE_RED_TYPE */
+      2172, /* GL_TEXTURE_GREEN_TYPE */
+      2088, /* GL_TEXTURE_BLUE_TYPE */
+      2065, /* GL_TEXTURE_ALPHA_TYPE */
+      2189, /* GL_TEXTURE_LUMINANCE_TYPE */
+      2178, /* GL_TEXTURE_INTENSITY_TYPE */
+      2154, /* GL_TEXTURE_DEPTH_TYPE */
+      2318, /* GL_UNSIGNED_NORMALIZED */
+      2056, /* GL_TEXTURE_1D_ARRAY */
+      1562, /* GL_PROXY_TEXTURE_1D_ARRAY */
+      2059, /* GL_TEXTURE_2D_ARRAY */
+      1566, /* GL_PROXY_TEXTURE_2D_ARRAY */
+      2069, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      2072, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1114, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
+      2092, /* GL_TEXTURE_BUFFER */
+      1167, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+      2076, /* GL_TEXTURE_BINDING_BUFFER */
+      2094, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      2096, /* GL_TEXTURE_BUFFER_FORMAT */
+      1599, /* GL_R11F_G11F_B10F */
+      2284, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      1736, /* GL_RGB9_E5 */
+      2293, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2213, /* GL_TEXTURE_SHARED_SIZE */
+      1909, /* GL_SRGB */
+      1910, /* GL_SRGB8 */
+      1912, /* GL_SRGB_ALPHA */
+      1911, /* GL_SRGB8_ALPHA8 */
+      1868, /* GL_SLUMINANCE_ALPHA */
+      1867, /* GL_SLUMINANCE8_ALPHA8 */
+      1865, /* GL_SLUMINANCE */
+      1866, /* GL_SLUMINANCE8 */
+       318, /* GL_COMPRESSED_SRGB */
+       319, /* GL_COMPRESSED_SRGB_ALPHA */
+       316, /* GL_COMPRESSED_SLUMINANCE */
+       317, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      2248, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2237, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      1186, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+      2246, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2242, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2240, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      1506, /* GL_PRIMITIVES_GENERATED */
+      2244, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      1613, /* GL_RASTERIZER_DISCARD */
+      1182, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+      1184, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+       818, /* GL_INTERLEAVED_ATTRIBS */
+      1844, /* GL_SEPARATE_ATTRIBS */
+      2232, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2234, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1442, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       911, /* GL_LOWER_LEFT */
+      2333, /* GL_UPPER_LEFT */
+      1933, /* GL_STENCIL_BACK_REF */
+      1934, /* GL_STENCIL_BACK_VALUE_MASK */
+      1935, /* GL_STENCIL_BACK_WRITEMASK */
+       548, /* GL_DRAW_FRAMEBUFFER_BINDING */
+      1643, /* GL_RENDERBUFFER_BINDING */
+      1617, /* GL_READ_FRAMEBUFFER */
+       547, /* GL_DRAW_FRAMEBUFFER */
+      1618, /* GL_READ_FRAMEBUFFER_BINDING */
+      1662, /* GL_RENDERBUFFER_SAMPLES */
+       452, /* GL_DEPTH_COMPONENT32F */
+       429, /* GL_DEPTH32F_STENCIL8 */
+       663, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       660, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       675, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       670, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       673, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       681, /* GL_FRAMEBUFFER_COMPLETE */
+       686, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       701, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       695, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       690, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       696, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       692, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+       706, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+       712, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       710, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+      1082, /* GL_MAX_COLOR_ATTACHMENTS */
+       198, /* GL_COLOR_ATTACHMENT0 */
+       201, /* GL_COLOR_ATTACHMENT1 */
+       215, /* GL_COLOR_ATTACHMENT2 */
+       217, /* GL_COLOR_ATTACHMENT3 */
+       219, /* GL_COLOR_ATTACHMENT4 */
+       221, /* GL_COLOR_ATTACHMENT5 */
+       223, /* GL_COLOR_ATTACHMENT6 */
+       225, /* GL_COLOR_ATTACHMENT7 */
+       227, /* GL_COLOR_ATTACHMENT8 */
+       229, /* GL_COLOR_ATTACHMENT9 */
+       202, /* GL_COLOR_ATTACHMENT10 */
+       204, /* GL_COLOR_ATTACHMENT11 */
+       206, /* GL_COLOR_ATTACHMENT12 */
+       208, /* GL_COLOR_ATTACHMENT13 */
+       210, /* GL_COLOR_ATTACHMENT14 */
+       212, /* GL_COLOR_ATTACHMENT15 */
+       430, /* GL_DEPTH_ATTACHMENT */
+      1922, /* GL_STENCIL_ATTACHMENT */
+       651, /* GL_FRAMEBUFFER */
+      1640, /* GL_RENDERBUFFER */
+      1666, /* GL_RENDERBUFFER_WIDTH */
+      1653, /* GL_RENDERBUFFER_HEIGHT */
+      1656, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1954, /* GL_STENCIL_INDEX_EXT */
+      1943, /* GL_STENCIL_INDEX1 */
+      1948, /* GL_STENCIL_INDEX4 */
+      1951, /* GL_STENCIL_INDEX8 */
+      1944, /* GL_STENCIL_INDEX16 */
+      1660, /* GL_RENDERBUFFER_RED_SIZE */
+      1651, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1646, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1641, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1648, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1664, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       704, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+      1162, /* GL_MAX_SAMPLES */
+      2167, /* GL_TEXTURE_GEN_STR_OES */
+       752, /* GL_HALF_FLOAT_OES */
+      1722, /* GL_RGB565 */
+       575, /* GL_ETC1_RGB8_OES */
+      2159, /* GL_TEXTURE_EXTERNAL_OES */
+      1811, /* GL_SAMPLER_EXTERNAL_OES */
+      2081, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+      1675, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+      1755, /* GL_RGBA32UI */
+      1716, /* GL_RGB32UI */
+        42, /* GL_ALPHA32UI_EXT */
+       810, /* GL_INTENSITY32UI_EXT */
+       930, /* GL_LUMINANCE32UI_EXT */
+       949, /* GL_LUMINANCE_ALPHA32UI_EXT */
+      1745, /* GL_RGBA16UI */
+      1707, /* GL_RGB16UI */
+        38, /* GL_ALPHA16UI_EXT */
+       806, /* GL_INTENSITY16UI_EXT */
+       924, /* GL_LUMINANCE16UI_EXT */
+       946, /* GL_LUMINANCE_ALPHA16UI_EXT */
+      1765, /* GL_RGBA8UI */
+      1731, /* GL_RGB8UI */
+        47, /* GL_ALPHA8UI_EXT */
+       815, /* GL_INTENSITY8UI_EXT */
+       939, /* GL_LUMINANCE8UI_EXT */
+       951, /* GL_LUMINANCE_ALPHA8UI_EXT */
+      1753, /* GL_RGBA32I */
+      1714, /* GL_RGB32I */
+        41, /* GL_ALPHA32I_EXT */
+       809, /* GL_INTENSITY32I_EXT */
+       929, /* GL_LUMINANCE32I_EXT */
+       948, /* GL_LUMINANCE_ALPHA32I_EXT */
+      1743, /* GL_RGBA16I */
+      1705, /* GL_RGB16I */
+        37, /* GL_ALPHA16I_EXT */
+       805, /* GL_INTENSITY16I_EXT */
+       923, /* GL_LUMINANCE16I_EXT */
+       945, /* GL_LUMINANCE_ALPHA16I_EXT */
+      1763, /* GL_RGBA8I */
+      1729, /* GL_RGB8I */
+        46, /* GL_ALPHA8I_EXT */
+       814, /* GL_INTENSITY8I_EXT */
+       938, /* GL_LUMINANCE8I_EXT */
+       950, /* GL_LUMINANCE_ALPHA8I_EXT */
+      1630, /* GL_RED_INTEGER */
+       747, /* GL_GREEN_INTEGER */
+       115, /* GL_BLUE_INTEGER */
+        51, /* GL_ALPHA_INTEGER_EXT */
+      1778, /* GL_RGB_INTEGER */
+      1772, /* GL_RGBA_INTEGER */
+        86, /* GL_BGR_INTEGER */
+        84, /* GL_BGRA_INTEGER */
+       953, /* GL_LUMINANCE_INTEGER_EXT */
+       952, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
+      1774, /* GL_RGBA_INTEGER_MODE_EXT */
+       824, /* GL_INT_2_10_10_10_REV */
+       658, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
+       699, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
+       698, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+       599, /* GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+       301, /* GL_COMPRESSED_RED_RGTC1 */
+       314, /* GL_COMPRESSED_SIGNED_RED_RGTC1 */
+       313, /* GL_COMPRESSED_RG_RGTC2 */
+       315, /* GL_COMPRESSED_SIGNED_RG_RGTC2 */
+      1790, /* GL_SAMPLER_1D_ARRAY */
+      1796, /* GL_SAMPLER_2D_ARRAY */
+      1806, /* GL_SAMPLER_BUFFER */
+      1792, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+      1798, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+      1809, /* GL_SAMPLER_CUBE_SHADOW */
+      2312, /* GL_UNSIGNED_INT_VEC2 */
+      2314, /* GL_UNSIGNED_INT_VEC3 */
+      2316, /* GL_UNSIGNED_INT_VEC4 */
+       825, /* GL_INT_SAMPLER_1D */
+       829, /* GL_INT_SAMPLER_2D */
+       835, /* GL_INT_SAMPLER_3D */
+       839, /* GL_INT_SAMPLER_CUBE */
+       833, /* GL_INT_SAMPLER_2D_RECT */
+       826, /* GL_INT_SAMPLER_1D_ARRAY */
+       830, /* GL_INT_SAMPLER_2D_ARRAY */
+       837, /* GL_INT_SAMPLER_BUFFER */
+      2296, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2300, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2306, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2310, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2304, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2297, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2301, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2308, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+       737, /* GL_GEOMETRY_SHADER */
+       740, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+       734, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+       736, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+      1120, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+      1202, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+      1118, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
+      1112, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
+      1116, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
+       912, /* GL_LOW_FLOAT */
+      1204, /* GL_MEDIUM_FLOAT */
+       753, /* GL_HIGH_FLOAT */
+       913, /* GL_LOW_INT */
+      1205, /* GL_MEDIUM_INT */
+       754, /* GL_HIGH_INT */
+      2286, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+       823, /* GL_INT_10_10_10_2_OES */
+      1849, /* GL_SHADER_BINARY_FORMATS */
+      1306, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1850, /* GL_SHADER_COMPILER */
+      1199, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+      1191, /* GL_MAX_VARYING_VECTORS */
+      1109, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+      1596, /* GL_QUERY_WAIT */
+      1590, /* GL_QUERY_NO_WAIT */
+      1586, /* GL_QUERY_BY_REGION_WAIT */
+      1584, /* GL_QUERY_BY_REGION_NO_WAIT */
+      2230, /* GL_TRANSFORM_FEEDBACK */
+      2239, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2233, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2231, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1580, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+       591, /* GL_FIRST_VERTEX_CONVENTION */
+       857, /* GL_LAST_VERTEX_CONVENTION */
+      1554, /* GL_PROVOKING_VERTEX */
+       360, /* GL_COPY_READ_BUFFER */
+       361, /* GL_COPY_WRITE_BUFFER */
+      1633, /* GL_RED_SNORM */
+      1786, /* GL_RG_SNORM */
+      1784, /* GL_RGB_SNORM */
+      1777, /* GL_RGBA_SNORM */
+      1612, /* GL_R8_SNORM */
+      1693, /* GL_RG8_SNORM */
+      1735, /* GL_RGB8_SNORM */
+      1769, /* GL_RGBA8_SNORM */
+      1604, /* GL_R16_SNORM */
+      1686, /* GL_RG16_SNORM */
+      1710, /* GL_RGB16_SNORM */
+      1748, /* GL_RGBA16_SNORM */
+      1861, /* GL_SIGNED_NORMALIZED */
+      1508, /* GL_PRIMITIVE_RESTART */
+      1509, /* GL_PRIMITIVE_RESTART_INDEX */
+      1697, /* GL_RGB10_A2UI */
+      1164, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1320, /* GL_OBJECT_TYPE */
+      1975, /* GL_SYNC_CONDITION */
+      1980, /* GL_SYNC_STATUS */
+      1977, /* GL_SYNC_FLAGS */
+      1976, /* GL_SYNC_FENCE */
+      1979, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2279, /* GL_UNSIGNALED */
+      1860, /* GL_SIGNALED */
+        56, /* GL_ALREADY_SIGNALED */
+      2225, /* GL_TIMEOUT_EXPIRED */
+       321, /* GL_CONDITION_SATISFIED */
+      2397, /* GL_WAIT_FAILED */
+       128, /* GL_BUFFER_ACCESS_FLAGS */
+       134, /* GL_BUFFER_MAP_LENGTH */
+       135, /* GL_BUFFER_MAP_OFFSET */
+      1194, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+      1110, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
+      1111, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
+      1106, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
+       336, /* GL_CONTEXT_PROFILE_MASK */
+       742, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
+      1096, /* GL_MAX_DEBUG_MESSAGE_LENGTH_ARB */
+      1095, /* GL_MAX_DEBUG_LOGGED_MESSAGES_ARB */
+       400, /* GL_DEBUG_LOGGED_MESSAGES_ARB */
+       405, /* GL_DEBUG_SEVERITY_HIGH_ARB */
+       407, /* GL_DEBUG_SEVERITY_MEDIUM_ARB */
+       406, /* GL_DEBUG_SEVERITY_LOW_ARB */
+       576, /* GL_EVAL_BIT */
+      1615, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       904, /* GL_LIST_BIT */
+      2085, /* GL_TEXTURE_BIT */
+      1830, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
-      1253, /* GL_MULTISAMPLE_BIT */
+      1269, /* GL_MULTISAMPLE_BIT */
         31, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 732b9a6ec..8c262af08 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -198,6 +198,7 @@ static const struct extension extension_table[] = {
    { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },
    { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },
    { "GL_EXT_texture_format_BGRA8888",             o(dummy_true),                                   ES1 | ES2, 2005 },
+   { "GL_EXT_read_format_bgra",                    o(dummy_true),                                   ES1 | ES2, 2009 },
    { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },
    { "GL_EXT_texture_lod_bias",                    o(dummy_true),                              GL | ES1,       1999 },
    { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },
@@ -212,6 +213,7 @@ static const struct extension extension_table[] = {
    { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },
    { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },
    { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },
+   { "GL_EXT_unpack_subimage",                     o(dummy_true),                                         ES2, 2011 },
    { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },
    { "GL_EXT_vertex_array",                        o(dummy_true),                              GL,             1995 },
 
diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index 756316a82..abd26b8d3 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -2128,6 +2128,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
                                       dstWidth, dstHeight, dstDepth,
                                       border, srcImage->InternalFormat,
                                       srcImage->TexFormat)) {
+         free(temp_dst);
          return;
       }
 
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index 78048615e..4c9063c7c 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -57,5068 +57,5076 @@ static const char _mesa_function_pool[] =
    "iiii\0"
    "glRasterPos4i\0"
    "\0"
-   /* _mesa_function_pool[145]: RasterPos4d (offset 78) */
+   /* _mesa_function_pool[145]: VertexAttribI4uiEXT (will be remapped) */
+   "iiiii\0"
+   "glVertexAttribI4uiEXT\0"
+   "glVertexAttribI4ui\0"
+   "\0"
+   /* _mesa_function_pool[193]: RasterPos4d (offset 78) */
    "dddd\0"
    "glRasterPos4d\0"
    "\0"
-   /* _mesa_function_pool[165]: NewList (dynamic) */
+   /* _mesa_function_pool[213]: NewList (dynamic) */
    "ii\0"
    "glNewList\0"
    "\0"
-   /* _mesa_function_pool[179]: RasterPos4f (offset 80) */
+   /* _mesa_function_pool[227]: RasterPos4f (offset 80) */
    "ffff\0"
    "glRasterPos4f\0"
    "\0"
-   /* _mesa_function_pool[199]: LoadIdentity (offset 290) */
+   /* _mesa_function_pool[247]: LoadIdentity (offset 290) */
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[216]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[255]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[264]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[296]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[305]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[351]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[360]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[384]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[393]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[402]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[411]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[444]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[453]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[464]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[473]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[509]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[518]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[555]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[564]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[609]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[618]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[626]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[635]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[643]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[652]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[663]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[672]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[696]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[705]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[734]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[743]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[785]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[794]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[801]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[810]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[817]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[826]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[842]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[851]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[858]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[867]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[895]: Histogram (offset 367) */
+   /* _mesa_function_pool[904]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[928]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[937]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[944]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[953]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[960]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[969]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[977]: FramebufferTexture (will be remapped) */
+   /* _mesa_function_pool[986]: FramebufferTexture (will be remapped) */
    "iiii\0"
    "glFramebufferTexture\0"
    "\0"
-   /* _mesa_function_pool[1004]: GetGraphicsResetStatusARB (will be remapped) */
-   "\0"
-   "glGetGraphicsResetStatusARB\0"
+   /* _mesa_function_pool[1013]: TexCoordP1ui (will be remapped) */
+   "ii\0"
+   "glTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[1034]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[1032]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[1064]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[1062]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[1084]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[1082]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1139]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1137]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1183]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1181]: PauseTransformFeedback (will be remapped) */
+   "\0"
+   "glPauseTransformFeedback\0"
+   "\0"
+   /* _mesa_function_pool[1208]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1265]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1290]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1291]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[1316]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[1312]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1337]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1358]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1383]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1404]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[1429]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[1432]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1457]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1452]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1477]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1467]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1492]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1482]: DebugMessageCallbackARB (will be remapped) */
+   /* _mesa_function_pool[1507]: DebugMessageCallbackARB (will be remapped) */
    "pp\0"
    "glDebugMessageCallbackARB\0"
    "\0"
-   /* _mesa_function_pool[1512]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1537]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1536]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1561]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1554]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1579]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1601]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1626]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1642]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1667]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1680]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1705]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   "ffffffffffff\0"
+   "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
+   "\0"
+   /* _mesa_function_pool[1758]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1699]: GetCombinerInputParameterfvNV (will be remapped) */
-   "iiiip\0"
-   "glGetCombinerInputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[1738]: MultiTexCoordP2ui (will be remapped) */
-   "iii\0"
-   "glMultiTexCoordP2ui\0"
+   /* _mesa_function_pool[1777]: TextureStorage3DEXT (will be remapped) */
+   "iiiiiii\0"
+   "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1763]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1808]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1805]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1850]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1834]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1879]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1850]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1895]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1893]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1938]: VertexAttribI4ivEXT (will be remapped) */
+   "ip\0"
+   "glVertexAttribI4ivEXT\0"
+   "glVertexAttribI4iv\0"
+   "\0"
+   /* _mesa_function_pool[1983]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1907]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1997]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1941]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[2031]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1982]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[2072]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[2036]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[2126]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[2055]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2145]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2091]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[2181]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[2113]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[2203]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[2128]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[2218]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2174]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[2264]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2189]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2279]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2236]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2326]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2302]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2392]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2333]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2423]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2359]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[2449]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[2380]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2470]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2412]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2502]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2431]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2521]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2474]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2564]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2500]: VertexP3ui (will be remapped) */
-   "ii\0"
-   "glVertexP3ui\0"
-   "\0"
-   /* _mesa_function_pool[2517]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2590]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2551]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2624]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2589]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2662]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2604]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2677]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2620]: TexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[2693]: TexCoordP1uiv (will be remapped) */
    "ip\0"
    "glTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[2640]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2713]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2659]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2732]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2683]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2756]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2698]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2771]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2760]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2833]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2805]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2878]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2853]: TexCoordP1ui (will be remapped) */
-   "ii\0"
-   "glTexCoordP1ui\0"
-   "\0"
-   /* _mesa_function_pool[2872]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2926]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2888]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2942]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2918]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2972]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2953]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[3007]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[3000]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[3054]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[3051]: GetDebugMessageLogARB (will be remapped) */
+   /* _mesa_function_pool[3105]: GetDebugMessageLogARB (will be remapped) */
    "iipppppp\0"
    "glGetDebugMessageLogARB\0"
    "\0"
-   /* _mesa_function_pool[3085]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3139]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3110]: CallLists (offset 3) */
+   /* _mesa_function_pool[3164]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[3127]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[3166]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[3181]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[3193]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[3208]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[3220]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[3235]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[3247]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[3262]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[3262]: PassThrough (offset 199) */
+   /* _mesa_function_pool[3277]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[3279]: GetnPixelMapusvARB (will be remapped) */
-   "iip\0"
-   "glGetnPixelMapusvARB\0"
+   /* _mesa_function_pool[3294]: VertexP3ui (will be remapped) */
+   "ii\0"
+   "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[3305]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[3311]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3349]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3355]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3440]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3446]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3470]: Viewport (offset 305) */
+   /* _mesa_function_pool[3476]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3487]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3493]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3534]: VertexP4uiv (will be remapped) */
-   "ip\0"
-   "glVertexP4uiv\0"
-   "\0"
-   /* _mesa_function_pool[3552]: VertexAttribP3ui (will be remapped) */
-   "iiii\0"
-   "glVertexAttribP3ui\0"
-   "\0"
-   /* _mesa_function_pool[3577]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3540]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3599]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3562]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3626]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3589]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
-   "glDeleteTransformFeedbacks\0"
+   "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[3657]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3620]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3684]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3647]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3734]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3697]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3781]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3744]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3802]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3765]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3830]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3793]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3855]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3818]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3880]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3843]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3916]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3879]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3956]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3919]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3993]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3956]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[4079]: MultiTexCoordP4uiv (will be remapped) */
-   "iip\0"
-   "glMultiTexCoordP4uiv\0"
-   "\0"
-   /* _mesa_function_pool[4105]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[4042]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[4141]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[4078]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[4159]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[4096]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[4193]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[4130]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[4217]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[4154]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[4249]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[4186]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[4309]: VertexAttribI4ubvEXT (will be remapped) */
-   "ip\0"
-   "glVertexAttribI4ubvEXT\0"
-   "glVertexAttribI4ubv\0"
-   "\0"
-   /* _mesa_function_pool[4356]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[4246]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[4390]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[4280]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[4407]: ColorP4uiv (will be remapped) */
-   "ip\0"
-   "glColorP4uiv\0"
-   "\0"
-   /* _mesa_function_pool[4424]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[4297]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[4439]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[4312]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[4465]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[4338]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4502]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[4375]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4562]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4435]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4576]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4449]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4640]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[4513]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[4661]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4534]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4702]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4575]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4717]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4590]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4734]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4607]: GetVertexAttribIuivEXT (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribIuivEXT\0"
+   "glGetVertexAttribIuiv\0"
+   "\0"
+   /* _mesa_function_pool[4659]: CreateShaderProgramEXT (will be remapped) */
+   "ip\0"
+   "glCreateShaderProgramEXT\0"
+   "\0"
+   /* _mesa_function_pool[4688]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4779]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4733]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4796]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4750]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4832]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4786]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4866]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[4820]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[4888]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4842]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4926]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4880]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4962]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4916]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4976]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[4930]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[5001]: TextureStorage1DEXT (will be remapped) */
+   /* _mesa_function_pool[4955]: GetnMapdvARB (will be remapped) */
+   "iiip\0"
+   "glGetnMapdvARB\0"
+   "\0"
+   /* _mesa_function_pool[4976]: TextureStorage1DEXT (will be remapped) */
    "iiiii\0"
    "glTextureStorage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[5030]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[5005]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[5056]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5031]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5077]: GetnUniformfvARB (will be remapped) */
-   "iiip\0"
-   "glGetnUniformfvARB\0"
+   /* _mesa_function_pool[5052]: VertexAttribP3ui (will be remapped) */
+   "iiii\0"
+   "glVertexAttribP3ui\0"
    "\0"
-   /* _mesa_function_pool[5102]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[5077]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[5128]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[5103]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[5158]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[5133]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
-   "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
+   "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[5214]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5189]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5245]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[5220]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[5275]: PointSize (offset 173) */
+   /* _mesa_function_pool[5250]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[5290]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[5265]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[5337]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5312]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5368]: PopName (offset 200) */
+   /* _mesa_function_pool[5343]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[5380]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[5355]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[5409]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[5384]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[5436]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[5411]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[5460]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[5435]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5486]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[5461]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[5503]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[5478]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[5548]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[5523]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[5596]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5571]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5611]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5586]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5638]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[5613]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[5683]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5658]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5700]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5675]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5725]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5700]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5744]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[5719]: BindFragDataLocationIndexed (will be remapped) */
    "iiip\0"
-   "glVertexAttribP2uiv\0"
+   "glBindFragDataLocationIndexed\0"
    "\0"
-   /* _mesa_function_pool[5770]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5755]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5798]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
-   "ffffffffffff\0"
-   "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
+   /* _mesa_function_pool[5783]: TextureStorage2DEXT (will be remapped) */
+   "iiiiii\0"
+   "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[5851]: Indexub (offset 315) */
+   /* _mesa_function_pool[5813]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5864]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[5826]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[5890]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5852]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   "iiipppp\0"
+   "glGetTransformFeedbackVarying\0"
+   "glGetTransformFeedbackVaryingEXT\0"
+   "\0"
+   /* _mesa_function_pool[5924]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5905]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5939]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5924]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5958]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5952]: TexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[5986]: TexCoordP4uiv (will be remapped) */
    "ip\0"
    "glTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[5972]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[6006]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5998]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[6032]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[6044]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[6078]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[6070]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6104]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6095]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[6129]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[6121]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[6155]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[6144]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[6178]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[6191]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[6225]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[6210]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[6244]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[6239]: Scaled (offset 301) */
+   /* _mesa_function_pool[6273]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[6253]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6287]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6281]: Scalef (offset 302) */
+   /* _mesa_function_pool[6315]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[6295]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6329]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6333]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[6367]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[6368]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[6402]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[6420]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[6454]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[6450]: TexCoordP3ui (will be remapped) */
-   "ii\0"
-   "glTexCoordP3ui\0"
-   "\0"
-   /* _mesa_function_pool[6469]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[6484]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[6485]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[6500]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[6540]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[6555]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[6554]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[6569]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[6571]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[6586]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[6629]: Rotated (offset 299) */
+   /* _mesa_function_pool[6644]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[6645]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[6660]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6697]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6712]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[6721]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6736]: BindBufferBaseEXT (will be remapped) */
+   "iii\0"
+   "glBindBufferBase\0"
+   "glBindBufferBaseEXT\0"
+   "\0"
+   /* _mesa_function_pool[6778]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6743]: VertexAttribDivisorARB (will be remapped) */
-   "ii\0"
-   "glVertexAttribDivisorARB\0"
-   "\0"
-   /* _mesa_function_pool[6772]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6800]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6787]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6815]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6816]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6844]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6840]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6868]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6854]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6882]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6875]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6903]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6896]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6924]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6921]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6949]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6966]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6994]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[7010]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[7038]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[7030]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7058]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7090]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[7118]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[7135]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[7163]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[7162]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[7190]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[7195]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[7223]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[7223]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[7251]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7308]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[7336]: VertexAttribI1iEXT (will be remapped) */
+   "ii\0"
+   "glVertexAttribI1iEXT\0"
+   "glVertexAttribI1i\0"
+   "\0"
+   /* _mesa_function_pool[7379]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[7333]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[7404]: GetCombinerInputParameterfvNV (will be remapped) */
+   "iiiip\0"
+   "glGetCombinerInputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[7443]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[7351]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[7461]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[7376]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[7486]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[7403]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[7513]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7445]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[7555]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[7485]: GenLists (offset 5) */
+   /* _mesa_function_pool[7595]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[7499]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[7609]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[7517]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[7627]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7551]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[7661]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7578]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7688]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7606]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[7716]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[7641]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[7751]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[7669]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[7779]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[7689]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7799]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[7709]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7819]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[7729]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7839]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[7755]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7865]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7783]: Scissor (offset 176) */
+   /* _mesa_function_pool[7893]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7799]: Fogf (offset 153) */
+   /* _mesa_function_pool[7909]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7810]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7920]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7855]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7965]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7899]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[8009]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7940]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[8050]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7956]: Color4usv (offset 40) */
+   /* _mesa_function_pool[8066]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7971]: Fogi (offset 155) */
+   /* _mesa_function_pool[8081]: GetnUniformfvARB (will be remapped) */
+   "iiip\0"
+   "glGetnUniformfvARB\0"
+   "\0"
+   /* _mesa_function_pool[8106]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7982]: DepthRange (offset 288) */
+   /* _mesa_function_pool[8117]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7999]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[8134]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[8017]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[8152]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[8046]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[8181]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[8063]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[8198]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[8081]: Color4ui (offset 37) */
+   /* _mesa_function_pool[8216]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[8098]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[8233]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[8117]: Color3usv (offset 24) */
+   /* _mesa_function_pool[8252]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[8132]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[8267]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[8152]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[8287]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[8169]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8304]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8218]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[8353]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[8235]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[8370]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[8254]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[8389]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[8273]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[8408]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[8304]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[8439]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[8356]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[8491]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[8373]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[8508]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[8422]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[8557]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[8478]: FogCoordPointerListIBM (dynamic) */
-   "iipi\0"
-   "glFogCoordPointerListIBM\0"
+   /* _mesa_function_pool[8613]: VertexAttribP2ui (will be remapped) */
+   "iiii\0"
+   "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[8509]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[8638]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[8563]: Color4us (offset 39) */
+   /* _mesa_function_pool[8692]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[8580]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[8709]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[8670]: Color3bv (offset 10) */
+   /* _mesa_function_pool[8799]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[8684]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[8813]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[8718]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8847]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8773]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8902]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8819]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8948]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8849]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8978]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8886]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[9015]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8915]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[9044]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[8933]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[9062]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8986]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[9115]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[9001]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[9130]: AlphaFragmentOp2ATI (will be remapped) */
+   "iiiiiiiii\0"
+   "glAlphaFragmentOp2ATI\0"
+   "\0"
+   /* _mesa_function_pool[9163]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[9023]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9185]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9053]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[9215]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9100]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[9262]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[9144]: ColorTable (offset 339) */
+   /* _mesa_function_pool[9306]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[9197]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[9359]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[9217]: Accum (offset 213) */
+   /* _mesa_function_pool[9379]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[9229]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[9391]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[9250]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[9412]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[9282]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[9444]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9338]: Finish (offset 216) */
+   /* _mesa_function_pool[9500]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[9349]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[9511]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9373]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[9535]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[9391]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[9553]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[9434]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[9596]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[9470]: HintPGI (dynamic) */
+   /* _mesa_function_pool[9632]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[9484]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[9646]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[9542]: Color4s (offset 33) */
+   /* _mesa_function_pool[9704]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[9558]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[9720]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[9583]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[9745]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[9601]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[9763]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9618]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[9780]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[9633]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[9795]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[9658]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[9820]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[9695]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9857]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9724]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9886]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9781]: Color4i (offset 31) */
+   /* _mesa_function_pool[9943]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9797]: Color4f (offset 29) */
+   /* _mesa_function_pool[9959]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9813]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9975]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9831]: Color4d (offset 27) */
+   /* _mesa_function_pool[9993]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9847]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[10009]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9863]: Color4b (offset 25) */
+   /* _mesa_function_pool[10025]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9879]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[10041]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9896]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[10058]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9926]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[10088]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9944]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[10106]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10002]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[10164]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[10023]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[10185]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[10042]: GetVertexAttribfvNV (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribfvNV\0"
+   /* _mesa_function_pool[10204]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[10069]: BeginTransformFeedbackEXT (will be remapped) */
-   "i\0"
-   "glBeginTransformFeedbackEXT\0"
-   "glBeginTransformFeedback\0"
+   /* _mesa_function_pool[10246]: GetFragDataLocationEXT (will be remapped) */
+   "ip\0"
+   "glGetFragDataLocationEXT\0"
+   "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[10125]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[10297]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[10147]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[10319]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[10163]: EndList (offset 1) */
+   /* _mesa_function_pool[10335]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[10175]: VertexP4ui (will be remapped) */
+   /* _mesa_function_pool[10347]: VertexP4ui (will be remapped) */
    "ii\0"
    "glVertexP4ui\0"
    "\0"
-   /* _mesa_function_pool[10192]: VertexAttrib4fvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4fvNV\0"
+   /* _mesa_function_pool[10364]: MultiTexCoordP1ui (will be remapped) */
+   "iii\0"
+   "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[10216]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[10389]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[10246]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[10419]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10280]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[10453]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[10298]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[10471]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[10349]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[10522]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[10368]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[10541]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[10383]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[10556]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[10411]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[10584]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[10439]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[10612]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[10495]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[10668]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[10523]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[10696]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[10541]: DebugMessageControlARB (will be remapped) */
+   /* _mesa_function_pool[10714]: DebugMessageControlARB (will be remapped) */
    "iiiipi\0"
    "glDebugMessageControlARB\0"
    "\0"
-   /* _mesa_function_pool[10574]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[10747]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[10622]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[10795]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[10665]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[10838]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[10690]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[10863]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[10715]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[10888]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[10765]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[10938]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[10783]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[10956]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[10835]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[11008]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[10861]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[11034]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10895]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[11068]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10923]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[11096]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10969]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11142]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10995]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[11168]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[11018]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[11191]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[11045]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[11218]: DeleteTransformFeedbacks (will be remapped) */
+   "ip\0"
+   "glDeleteTransformFeedbacks\0"
+   "\0"
+   /* _mesa_function_pool[11249]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[11060]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[11264]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[11087]: Color3us (offset 23) */
+   /* _mesa_function_pool[11291]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[11103]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[11307]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[11138]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[11342]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[11181]: End (offset 43) */
+   /* _mesa_function_pool[11385]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[11189]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[11393]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[11214]: MultiTexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[11418]: MultiTexCoordP3uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[11240]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[11444]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11266]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[11470]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[11296]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[11500]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[11341]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[11545]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11387]: Color3ub (offset 19) */
+   /* _mesa_function_pool[11591]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[11403]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[11607]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[11435]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[11639]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11460]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11664]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11495]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11699]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11518]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[11722]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[11558]: Color3ui (offset 21) */
+   /* _mesa_function_pool[11762]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[11574]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[11778]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[11591]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[11795]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11637]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[11841]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11664]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[11868]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11700]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[11904]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[11716]: GetTransformFeedbackVaryingEXT (will be remapped) */
-   "iiipppp\0"
-   "glGetTransformFeedbackVaryingEXT\0"
-   "glGetTransformFeedbackVarying\0"
+   /* _mesa_function_pool[11920]: PixelTransformParameterfvEXT (dynamic) */
+   "iip\0"
+   "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11788]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[11956]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[11831]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[11999]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[11853]: GetIntegerIndexedvEXT (will be remapped) */
-   "iip\0"
-   "glGetIntegerIndexedvEXT\0"
-   "glGetIntegeri_v\0"
+   /* _mesa_function_pool[12021]: TexCoordP2uiv (will be remapped) */
+   "ip\0"
+   "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[11898]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[12041]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[11944]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[12087]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11977]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[12120]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[12001]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[12144]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12026]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[12169]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[12079]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[12222]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[12136]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[12279]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[12174]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[12317]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[12199]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[12342]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[12242]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[12385]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[12289]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12432]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12353]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[12496]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[12397]: GetError (offset 261) */
+   /* _mesa_function_pool[12540]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[12410]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[12553]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[12429]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[12572]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[12446]: Indexdv (offset 45) */
+   /* _mesa_function_pool[12589]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[12459]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[12602]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[12515]: Normal3s (offset 60) */
+   /* _mesa_function_pool[12658]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[12531]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[12674]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12565]: PushName (offset 201) */
+   /* _mesa_function_pool[12708]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[12579]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[12722]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[12624]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[12767]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[12649]: Normal3i (offset 58) */
+   /* _mesa_function_pool[12792]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[12665]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[12808]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[12700]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12843]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12757]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[12900]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[12800]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[12943]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[12821]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[12964]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[12871]: ImageTransformParameteriHP (dynamic) */
-   "iii\0"
-   "glImageTransformParameteriHP\0"
+   /* _mesa_function_pool[13014]: VertexAttribP1uiv (will be remapped) */
+   "iiip\0"
+   "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[12905]: Normal3b (offset 52) */
+   /* _mesa_function_pool[13040]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[12921]: Normal3d (offset 54) */
+   /* _mesa_function_pool[13056]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[12937]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[13072]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12970]: Normal3f (offset 56) */
+   /* _mesa_function_pool[13105]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12986]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[13121]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[13031]: Indexi (offset 48) */
+   /* _mesa_function_pool[13166]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[13043]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[13178]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[13076]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[13211]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[13104]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[13239]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13125]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13260]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13154]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[13289]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
-   "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
+   "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[13200]: DepthMask (offset 211) */
+   /* _mesa_function_pool[13335]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[13215]: IsShader (will be remapped) */
+   /* _mesa_function_pool[13350]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[13229]: Indexf (offset 46) */
+   /* _mesa_function_pool[13364]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[13241]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[13376]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[13279]: Indexd (offset 44) */
+   /* _mesa_function_pool[13414]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[13291]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[13426]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[13312]: StencilOp (offset 244) */
+   /* _mesa_function_pool[13447]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[13329]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[13464]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[13351]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[13486]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[13396]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[13531]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[13412]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[13547]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[13458]: Indexs (offset 50) */
+   /* _mesa_function_pool[13593]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[13470]: Binormal3ivEXT (dynamic) */
-   "p\0"
-   "glBinormal3ivEXT\0"
+   /* _mesa_function_pool[13605]: TexCoordP3ui (will be remapped) */
+   "ii\0"
+   "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[13490]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[13624]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[13512]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[13646]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[13538]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[13672]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[13599]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[13733]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[13637]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[13771]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[13669]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13803]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13696]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[13830]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[13711]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[13845]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[13728]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[13862]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[13775]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[13909]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[13790]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13924]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13843]: Color4bv (offset 26) */
+   /* _mesa_function_pool[13977]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[13857]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[13991]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[13879]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[14013]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[13927]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14061]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[13952]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[14086]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[14000]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[14134]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[14024]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[14158]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[14059]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14193]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[14077]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14211]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[14090]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[14224]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[14114]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[14248]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[14129]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14263]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[14205]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[14339]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[14222]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[14356]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[14242]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[14376]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[14269]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[14403]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[14314]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[14448]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[14329]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14463]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14361]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[14495]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[14406]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[14540]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[14434]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[14568]: ColorP4uiv (will be remapped) */
    "ip\0"
-   "glVertexAttrib2dvNV\0"
+   "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[14458]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[14585]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14519]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[14646]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[14541]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[14668]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[14565]: GenTextures (offset 328) */
+   /* _mesa_function_pool[14692]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14600]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[14727]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[14630]: SetFenceNV (will be remapped) */
-   "ii\0"
-   "glSetFenceNV\0"
+   /* _mesa_function_pool[14757]: MultiTexCoordP4uiv (will be remapped) */
+   "iip\0"
+   "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[14647]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[14783]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[14703]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14839]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14742]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[14878]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[14910]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[14775]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[14943]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[14797]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14965]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14825]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[14993]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[14843]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[15011]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[14868]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[15036]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[14886]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[15054]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[14901]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[15069]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[14917]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[15085]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[14934]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[15102]: BeginFragmentShaderATI (will be remapped) */
+   "\0"
+   "glBeginFragmentShaderATI\0"
+   "\0"
+   /* _mesa_function_pool[15129]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[14958]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[15153]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14975]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[15170]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15030]: VertexAttribP1uiv (will be remapped) */
-   "iiip\0"
-   "glVertexAttribP1uiv\0"
-   "\0"
-   /* _mesa_function_pool[15056]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[15225]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[15081]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[15250]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[15096]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[15265]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[15115]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[15284]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[15144]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[15313]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[15187]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[15356]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15231]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[15400]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[15246]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[15415]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[15262]: EndTransformFeedbackEXT (will be remapped) */
-   "\0"
-   "glEndTransformFeedbackEXT\0"
-   "glEndTransformFeedback\0"
+   /* _mesa_function_pool[15431]: ColorP3ui (will be remapped) */
+   "ii\0"
+   "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[15313]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[15447]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15347]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[15481]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15376]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[15510]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[15421]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15555]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15477]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[15611]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[15498]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[15632]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[15531]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[15665]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[15561]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[15695]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[15596]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[15730]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15615]: Flush (offset 217) */
+   /* _mesa_function_pool[15749]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[15625]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[15759]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[15640]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[15774]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[15686]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[15820]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[15708]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[15842]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[15744]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[15878]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[15762]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[15896]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[15781]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[15915]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[15824]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[15958]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[15848]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[15982]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[15864]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[15998]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[15882]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[16016]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[15924]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[16058]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15946]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[16080]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[15966]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16100]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16007]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[16141]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[16062]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[16196]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[16080]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[16214]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[16104]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[16238]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[16122]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[16256]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[16140]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[16274]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[16194]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[16328]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[16236]: Color4ub (offset 35) */
+   /* _mesa_function_pool[16370]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[16253]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[16387]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[16273]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[16407]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[16302]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[16436]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[16320]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[16454]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[16380]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[16514]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[16399]: Indexiv (offset 49) */
+   /* _mesa_function_pool[16533]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[16412]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[16546]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[16430]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[16564]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[16474]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[16608]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[16534]: Frustum (offset 289) */
+   /* _mesa_function_pool[16668]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[16552]: GetString (offset 275) */
+   /* _mesa_function_pool[16686]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[16567]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[16701]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[16593]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[16727]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[16608]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[16742]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[16626]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[16760]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[16644]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[16778]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[16674]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[16808]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[16692]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[16826]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16737]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[16871]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[16781]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[16915]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[16824]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[16958]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[16851]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[16985]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[16892]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[17026]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16920]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[17054]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[16955]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[17089]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[16973]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[17107]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17004]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17138]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17038]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[17172]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[17064]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[17198]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[17089]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[17223]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[17145]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[17279]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[17164]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[17298]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[17180]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[17314]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[17228]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[17362]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17274]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[17408]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[17291]: VertexAttribI4uiEXT (will be remapped) */
-   "iiiii\0"
-   "glVertexAttribI4uiEXT\0"
-   "glVertexAttribI4ui\0"
+   /* _mesa_function_pool[17425]: TexStorage3D (will be remapped) */
+   "iiiiii\0"
+   "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[17339]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[17448]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17372]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[17481]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[17399]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17508]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17426]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17535]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17463]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[17572]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[17490]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[17599]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[17510]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[17619]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[17531]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[17640]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17558]: VertexP3uiv (will be remapped) */
-   "ip\0"
-   "glVertexP3uiv\0"
+   /* _mesa_function_pool[17667]: ImageTransformParameterivHP (dynamic) */
+   "iip\0"
+   "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17576]: Rectd (offset 86) */
+   /* _mesa_function_pool[17702]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[17590]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17716]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17616]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[17742]: SampleMaskSGIS (will be remapped) */
+   "fi\0"
+   "glSampleMaskSGIS\0"
+   "glSampleMaskEXT\0"
    "\0"
-   "glTextureBarrierNV\0"
+   /* _mesa_function_pool[17779]: Binormal3ivEXT (dynamic) */
+   "p\0"
+   "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17637]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[17799]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17663]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "glColorMaski\0"
+   /* _mesa_function_pool[17825]: VertexAttribI4ubvEXT (will be remapped) */
+   "ip\0"
+   "glVertexAttribI4ubvEXT\0"
+   "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[17705]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[17872]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[17752]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[17919]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[17771]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[17938]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[17816]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17983]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17841]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18008]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17871]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[18038]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[17918]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[18085]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[17966]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[18133]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[18024]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[18191]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[18058]: Lightfv (offset 160) */
+   /* _mesa_function_pool[18225]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[18073]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[18240]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
-   "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
+   "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[18126]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[18293]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[18142]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[18309]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[18162]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[18329]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[18184]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[18351]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[18227]: Color4fv (offset 30) */
+   /* _mesa_function_pool[18394]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[18241]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[18408]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18286]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[18453]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[18310]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18477]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18347]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[18514]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[18368]: Rects (offset 92) */
+   /* _mesa_function_pool[18535]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[18382]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[18549]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[18416]: CreateShaderProgramEXT (will be remapped) */
-   "ip\0"
-   "glCreateShaderProgramEXT\0"
+   /* _mesa_function_pool[18583]: MultiTexCoordP2ui (will be remapped) */
+   "iii\0"
+   "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[18445]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[18608]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[18467]: Lightiv (offset 162) */
+   /* _mesa_function_pool[18630]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[18482]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[18645]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[18526]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[18689]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[18574]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[18737]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18599]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[18762]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[18623]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[18786]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[18668]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[18831]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[18689]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[18852]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[18732]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18895]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18758]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[18921]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[18784]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[18947]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[18802]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[18965]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[18845]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[19008]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[18899]: Rectdv (offset 87) */
+   /* _mesa_function_pool[19062]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[18912]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[19075]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18938]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[19101]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[18988]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19151]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19047]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19210]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19075]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[19238]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[19120]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[19283]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[19198]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[19361]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[19225]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[19388]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19252]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[19415]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[19274]: Materialiv (offset 172) */
+   /* _mesa_function_pool[19437]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[19292]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[19455]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[19314]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[19477]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[19340]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19503]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19386]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[19549]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[19439]: SampleMaskSGIS (will be remapped) */
-   "fi\0"
-   "glSampleMaskSGIS\0"
-   "glSampleMaskEXT\0"
-   "\0"
-   /* _mesa_function_pool[19476]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[19602]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19522]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[19648]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[19540]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[19666]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[19604]: VertexAttribI1iEXT (will be remapped) */
-   "ii\0"
-   "glVertexAttribI1iEXT\0"
-   "glVertexAttribI1i\0"
+   /* _mesa_function_pool[19730]: VertexAttrib2dvNV (will be remapped) */
+   "ip\0"
+   "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[19647]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19754]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19689]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[19796]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[19716]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[19823]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[19743]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[19850]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[19768]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[19875]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[19810]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[19917]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[19827]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19934]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[19883]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[19990]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[19911]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[20018]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[19930]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[20037]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[19968]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[20075]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[19986]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[20093]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[20010]: TexGeni (offset 192) */
+   /* _mesa_function_pool[20117]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[20025]: TexGenf (offset 190) */
+   /* _mesa_function_pool[20132]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[20040]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[20147]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[20073]: TexGend (offset 188) */
+   /* _mesa_function_pool[20180]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[20088]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[20195]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20115]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[20222]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[20138]: ColorP3ui (will be remapped) */
-   "ii\0"
-   "glColorP3ui\0"
-   "\0"
-   /* _mesa_function_pool[20154]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[20245]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[20173]: BindBufferOffsetEXT (will be remapped) */
-   "iiii\0"
-   "glBindBufferOffsetEXT\0"
+   /* _mesa_function_pool[20264]: GetVertexAttribfvNV (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[20201]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[20291]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[20255]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[20345]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[20279]: DisableIndexedEXT (will be remapped) */
-   "ii\0"
-   "glDisableIndexedEXT\0"
-   "glDisablei\0"
-   "\0"
-   /* _mesa_function_pool[20314]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[20369]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20332]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[20387]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20358]: BindBufferBaseEXT (will be remapped) */
-   "iii\0"
-   "glBindBufferBaseEXT\0"
-   "glBindBufferBase\0"
+   /* _mesa_function_pool[20413]: VertexAttribs1fvNV (will be remapped) */
+   "iip\0"
+   "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[20400]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20439]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[20429]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[20468]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[20453]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[20492]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[20479]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[20518]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[20526]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[20565]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[20576]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[20615]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[20607]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[20646]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[20634]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[20673]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[20668]: Color4sv (offset 34) */
+   /* _mesa_function_pool[20707]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[20682]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[20721]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[20712]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[20751]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[20744]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[20783]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20779]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[20818]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[20795]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[20834]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[20828]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[20867]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[20886]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[20925]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[20942]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20981]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[20972]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[21011]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[20992]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[21031]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[21011]: Color3dv (offset 12) */
+   /* _mesa_function_pool[21050]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[21025]: IsTexture (offset 330) */
+   /* _mesa_function_pool[21064]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[21055]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[21094]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[21073]: VertexAttribP3uiv (will be remapped) */
-   "iiip\0"
-   "glVertexAttribP3uiv\0"
+   /* _mesa_function_pool[21112]: ColorPointerEXT (will be remapped) */
+   "iiiip\0"
+   "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21099]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[21137]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[21122]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[21160]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[21163]: ImageTransformParameterivHP (dynamic) */
-   "iip\0"
-   "glImageTransformParameterivHP\0"
+   /* _mesa_function_pool[21201]: VertexP3uiv (will be remapped) */
+   "ip\0"
+   "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[21198]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[21219]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[21217]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[21238]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[21256]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[21277]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[21286]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[21307]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[21318]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[21339]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[21347]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[21368]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[21363]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[21384]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[21391]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[21412]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[21408]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[21429]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[21450]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[21471]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[21468]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[21489]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[21494]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21515]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21543]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[21564]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[21561]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[21582]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[21606]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[21627]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[21640]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[21661]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[21664]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[21685]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[21703]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[21724]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[21732]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[21753]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[21750]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[21771]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[21793]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[21814]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[21813]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[21834]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[21881]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[21902]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[21936]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[21957]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[21974]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[21995]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[22008]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[22029]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[22056]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[22077]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[22084]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[22105]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[22137]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[22158]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22158]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[22179]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[22185]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[22206]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[22217]: TagSampleBufferSGIX (dynamic) */
-   "\0"
-   "glTagSampleBufferSGIX\0"
+   /* _mesa_function_pool[22238]: TexCoordP3uiv (will be remapped) */
+   "ip\0"
+   "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[22241]: TransformFeedbackVaryingsEXT (will be remapped) */
-   "iipi\0"
-   "glTransformFeedbackVaryingsEXT\0"
-   "glTransformFeedbackVaryings\0"
+   /* _mesa_function_pool[22258]: ReplacementCodeusSUN (dynamic) */
+   "i\0"
+   "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[22306]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[22284]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[22328]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[22306]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[22346]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[22324]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[22369]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[22347]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[22396]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[22374]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[22446]: Color3s (offset 17) */
+   /* _mesa_function_pool[22424]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[22461]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[22439]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[22495]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[22473]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[22548]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[22526]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[22567]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[22545]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[22583]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[22561]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[22607]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[22585]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[22651]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[22629]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[22686]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[22664]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[22709]: Color3i (offset 15) */
+   /* _mesa_function_pool[22687]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[22724]: FrontFace (offset 157) */
+   /* _mesa_function_pool[22702]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[22739]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[22717]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[22757]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[22735]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[22805]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[22783]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[22823]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[22801]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22866]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[22844]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[22916]: Color3b (offset 9) */
+   /* _mesa_function_pool[22894]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[22931]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[22909]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[22975]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[22953]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[22999]: Color3f (offset 13) */
+   /* _mesa_function_pool[22977]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[23014]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[22992]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[23034]: Color3d (offset 11) */
+   /* _mesa_function_pool[23012]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[23049]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[23027]: TextureBarrierNV (will be remapped) */
+   "\0"
+   "glTextureBarrierNV\0"
+   "\0"
+   /* _mesa_function_pool[23048]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[23064]: Lightf (offset 159) */
+   /* _mesa_function_pool[23063]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[23078]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[23077]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[23104]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[23103]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[23120]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[23119]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[23141]: Lighti (offset 161) */
+   /* _mesa_function_pool[23140]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[23155]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[23154]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[23186]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[23185]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[23203]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[23202]: GetFragDataIndex (will be remapped) */
+   "ip\0"
+   "glGetFragDataIndex\0"
+   "\0"
+   /* _mesa_function_pool[23225]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[23248]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[23270]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23333]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[23355]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[23368]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[23390]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[23413]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[23435]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23448]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[23470]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[23465]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[23487]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[23490]: TexCoordP2uiv (will be remapped) */
-   "ip\0"
-   "glTexCoordP2uiv\0"
-   "\0"
-   /* _mesa_function_pool[23510]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[23512]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[23527]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[23529]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[23544]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[23546]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[23589]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23591]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23632]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[23634]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[23663]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[23665]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[23684]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[23686]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[23739]: VertexAttrib3sNV (will be remapped) */
-   "iiii\0"
-   "glVertexAttrib3sNV\0"
-   "\0"
-   /* _mesa_function_pool[23764]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[23741]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23790]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[23767]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23835]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[23812]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23869]: TexCoordP3uiv (will be remapped) */
-   "ip\0"
-   "glTexCoordP3uiv\0"
+   /* _mesa_function_pool[23846]: TagSampleBufferSGIX (dynamic) */
    "\0"
-   /* _mesa_function_pool[23889]: UniformMatrix2x3fv (will be remapped) */
+   "glTagSampleBufferSGIX\0"
+   "\0"
+   /* _mesa_function_pool[23870]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[23916]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[23897]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[23941]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[23922]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[23966]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[23947]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[23993]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[23974]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[24022]: ReplacementCodeusSUN (dynamic) */
-   "i\0"
-   "glReplacementCodeusSUN\0"
+   /* _mesa_function_pool[24003]: TransformFeedbackVaryingsEXT (will be remapped) */
+   "iipi\0"
+   "glTransformFeedbackVaryings\0"
+   "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[24048]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[24068]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[24071]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[24091]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[24090]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24110]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24117]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[24137]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[24143]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[24163]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[24161]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[24181]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[24206]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[24226]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[24249]: ClearColor (offset 206) */
+   /* _mesa_function_pool[24269]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[24268]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[24288]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[24287]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[24307]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[24311]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24331]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24360]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[24380]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[24387]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24407]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[24426]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[24446]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[24442]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[24462]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[24490]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[24510]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24510]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[24530]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[24558]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[24578]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[24582]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24602]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24623]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[24643]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[24655]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[24675]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[24673]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[24693]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24765]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[24785]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24796]: Bitmap (offset 8) */
+   /* _mesa_function_pool[24816]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[24814]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[24834]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[24859]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[24879]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24890]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[24910]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[24926]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24946]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24969]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[24989]: BindBufferOffsetEXT (will be remapped) */
+   "iiii\0"
+   "glBindBufferOffsetEXT\0"
+   "\0"
+   /* _mesa_function_pool[25017]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[24995]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[25043]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[25027]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[25075]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[25042]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[25090]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[25060]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25108]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[25100]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[25148]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[25127]: GetnMapdvARB (will be remapped) */
-   "iiip\0"
-   "glGetnMapdvARB\0"
+   /* _mesa_function_pool[25175]: VertexAttribDivisorARB (will be remapped) */
+   "ii\0"
+   "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[25148]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[25204]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[25167]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[25223]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[25215]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[25271]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[25250]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[25306]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[25277]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[25333]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[25301]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[25357]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25335]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[25391]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[25387]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[25443]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[25406]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[25462]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[25437]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[25493]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[25475]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[25531]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[25518]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[25574]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[25563]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[25619]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[25583]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25639]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25654]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[25710]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25676]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[25732]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[25696]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[25752]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[25750]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[25806]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25803]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[25859]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[25831]: Map1d (offset 220) */
+   /* _mesa_function_pool[25887]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[25847]: Map1f (offset 221) */
+   /* _mesa_function_pool[25903]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[25863]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[25919]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[25922]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[25978]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[25958]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[26014]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[25982]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[26038]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[26003]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[26059]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26034]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[26090]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[26073]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[26129]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[26095]: GetFragDataLocationEXT (will be remapped) */
-   "ip\0"
-   "glGetFragDataLocationEXT\0"
-   "glGetFragDataLocation\0"
+   /* _mesa_function_pool[26151]: GetIntegerIndexedvEXT (will be remapped) */
+   "iip\0"
+   "glGetIntegerIndexedvEXT\0"
+   "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[26146]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[26196]: BeginTransformFeedbackEXT (will be remapped) */
+   "i\0"
+   "glBeginTransformFeedback\0"
+   "glBeginTransformFeedbackEXT\0"
+   "\0"
+   /* _mesa_function_pool[26252]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26200]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[26306]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[26221]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[26327]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26267]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[26373]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[26282]: Fogiv (offset 156) */
+   /* _mesa_function_pool[26388]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[26294]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[26400]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26311]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[26417]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[26347]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[26453]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[26368]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[26474]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[26395]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[26501]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[26419]: Rotatef (offset 300) */
+   /* _mesa_function_pool[26525]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[26435]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[26541]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26477]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[26583]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[26493]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[26599]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[26518]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[26624]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[26534]: Clear (offset 203) */
+   /* _mesa_function_pool[26640]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[26545]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[26651]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[26561]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[26667]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26588]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[26694]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[26622]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[26728]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[26638]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[26744]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[26694]: Ortho (offset 296) */
+   /* _mesa_function_pool[26800]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[26710]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[26816]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[26731]: ListBase (offset 6) */
+   /* _mesa_function_pool[26837]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[26745]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[26851]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[26790]: MultiTexCoordP1ui (will be remapped) */
-   "iii\0"
-   "glMultiTexCoordP1ui\0"
+   /* _mesa_function_pool[26896]: VertexAttrib4fvNV (will be remapped) */
+   "ip\0"
+   "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26815]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[26920]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[26831]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[26936]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[26887]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[26992]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26979]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[27084]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27036]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[27141]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[27052]: VertexAttribs2fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs2fvNV\0"
+   /* _mesa_function_pool[27157]: BlendEquationSeparateiARB (will be remapped) */
+   "iii\0"
+   "glBlendEquationSeparateiARB\0"
+   "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[27078]: Rectiv (offset 91) */
+   /* _mesa_function_pool[27224]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[27091]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[27237]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[27129]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[27275]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27156]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[27302]: EndConditionalRenderNV (will be remapped) */
    "\0"
-   "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
+   "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[27206]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[27352]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[27229]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[27375]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[27248]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[27394]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27277]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[27423]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[27297]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[27443]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[27343]: AlphaFragmentOp2ATI (will be remapped) */
-   "iiiiiiiii\0"
-   "glAlphaFragmentOp2ATI\0"
+   /* _mesa_function_pool[27489]: VertexAttrib1dNV (will be remapped) */
+   "id\0"
+   "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[27376]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[27512]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[27391]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[27527]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[27436]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[27572]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[27481]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[27617]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[27527]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[27663]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[27562]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[27698]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[27577]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[27713]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[27625]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[27761]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[27660]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[27796]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[27703]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[27839]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[27720]: PauseTransformFeedback (will be remapped) */
-   "\0"
-   "glPauseTransformFeedback\0"
+   /* _mesa_function_pool[27856]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27747]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[27895]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[27790]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27938]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27837]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[27985]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[27925]: VertexAttribs1fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs1fvNV\0"
+   /* _mesa_function_pool[28073]: DisableIndexedEXT (will be remapped) */
+   "ii\0"
+   "glDisableIndexedEXT\0"
+   "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[27951]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[28108]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[27996]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[28153]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[28028]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[28185]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[28043]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[28200]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[28069]: ColorPointerEXT (will be remapped) */
-   "iiiip\0"
-   "glColorPointerEXT\0"
+   /* _mesa_function_pool[28226]: VertexAttribP3uiv (will be remapped) */
+   "iiip\0"
+   "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[28094]: LineWidth (offset 168) */
+   /* _mesa_function_pool[28252]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[28109]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[28267]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28128]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28286]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28159]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28317]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[28197]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[28355]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[28243]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[28401]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28263]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[28421]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[28284]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[28442]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[28314]: TexGendv (offset 189) */
+   /* _mesa_function_pool[28472]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[28330]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[28488]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[28375]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[28533]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[28408]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[28566]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[28433]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[28591]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[28454]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[28612]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[28488]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[28646]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28515]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[28673]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[28538]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[28696]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[28564]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[28722]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28628]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[28786]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[28654]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[28686]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[28812]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[28730]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[28856]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[28761]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[28887]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[28798]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[28924]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28819]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[28945]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[28841]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[28967]: EndTransformFeedbackEXT (will be remapped) */
+   "\0"
+   "glEndTransformFeedback\0"
+   "glEndTransformFeedbackEXT\0"
+   "\0"
+   /* _mesa_function_pool[29018]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[28876]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[29053]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[28897]: CallList (offset 2) */
+   /* _mesa_function_pool[29074]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[28911]: Materialfv (offset 170) */
+   /* _mesa_function_pool[29088]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28929]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[29106]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[28946]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[29123]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28978]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[29155]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[29023]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[29200]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[29071]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[29248]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[29116]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29293]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29134]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[29311]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[29187]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[29364]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[29218]: Color3iv (offset 16) */
+   /* _mesa_function_pool[29395]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[29232]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[29409]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[29266]: DrawElements (offset 311) */
+   /* _mesa_function_pool[29443]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[29287]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[29464]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[29313]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29490]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29350]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[29527]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29410]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[29587]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[29453]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[29630]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[29508]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[29685]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[29531]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[29708]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "\0"
-   /* _mesa_function_pool[29551]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[29728]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[29624]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[29801]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[29647]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[29824]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29678]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[29855]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29715]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[29892]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[29732]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[29909]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[29768]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[29945]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[29784]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[29961]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[29804]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[29981]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[29818]: GetVertexAttribIuivEXT (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribIuivEXT\0"
-   "glGetVertexAttribIuiv\0"
-   "\0"
-   /* _mesa_function_pool[29870]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[29995]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[29889]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[30014]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29909]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[30034]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[29958]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[30083]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[30004]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[30129]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[30023]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[30148]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[30049]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[30174]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[30092]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[30217]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[30117]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[30242]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30162]: Map2d (offset 222) */
+   /* _mesa_function_pool[30287]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[30182]: Map2f (offset 223) */
+   /* _mesa_function_pool[30307]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[30202]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[30327]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[30227]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[30352]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[30244]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[30369]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30273]: TextureStorage3DEXT (will be remapped) */
-   "iiiiiii\0"
-   "glTextureStorage3DEXT\0"
-   "\0"
-   /* _mesa_function_pool[30304]: FragmentLightModelivSGIX (dynamic) */
-   "ip\0"
-   "glFragmentLightModelivSGIX\0"
+   /* _mesa_function_pool[30398]: VertexAttrib3sNV (will be remapped) */
+   "iiii\0"
+   "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[30335]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[30423]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[30358]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[30446]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[30375]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[30463]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[30392]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[30480]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[30409]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[30497]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[30427]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[30515]: GetGraphicsResetStatusARB (will be remapped) */
+   "\0"
+   "glGetGraphicsResetStatusARB\0"
+   "\0"
+   /* _mesa_function_pool[30545]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[30453]: FragmentLightfSGIX (dynamic) */
-   "iif\0"
-   "glFragmentLightfSGIX\0"
+   /* _mesa_function_pool[30571]: VertexAttribP2uiv (will be remapped) */
+   "iiip\0"
+   "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[30479]: TextureStorage2DEXT (will be remapped) */
-   "iiiiii\0"
-   "glTextureStorage2DEXT\0"
+   /* _mesa_function_pool[30597]: PrimitiveRestartNV (will be remapped) */
+   "\0"
+   "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[30509]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[30620]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[30565]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[30676]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[30584]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[30695]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[30601]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[30712]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[30632]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[30743]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[30672]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[30783]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[30698]: TexStorage3D (will be remapped) */
-   "iiiiii\0"
-   "glTexStorage3D\0"
-   "\0"
-   /* _mesa_function_pool[30721]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[30809]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[30752]: Materialf (offset 169) */
+   /* _mesa_function_pool[30840]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[30769]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[30857]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[30814]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[30902]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[30839]: Materiali (offset 171) */
+   /* _mesa_function_pool[30927]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[30856]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[30944]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[30882]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[30970]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[30917]: Indexsv (offset 51) */
+   /* _mesa_function_pool[31005]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[30930]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[31018]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[30975]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[31063]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[30994]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[31082]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[31011]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[31099]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[31044]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[31132]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[31062]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[31150]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31099]: Translated (offset 303) */
+   /* _mesa_function_pool[31187]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[31117]: Translatef (offset 304) */
+   /* _mesa_function_pool[31205]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[31135]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[31223]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[31170]: StencilMask (offset 209) */
+   /* _mesa_function_pool[31258]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[31187]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[31275]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31207]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[31295]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[31227]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[31315]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[31245]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[31333]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[31275]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[31363]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[31301]: IsList (offset 287) */
+   /* _mesa_function_pool[31389]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[31313]: IsSync (will be remapped) */
+   /* _mesa_function_pool[31401]: GetnPixelMapusvARB (will be remapped) */
+   "iip\0"
+   "glGetnPixelMapusvARB\0"
+   "\0"
+   /* _mesa_function_pool[31427]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[31325]: RenderMode (offset 196) */
+   /* _mesa_function_pool[31439]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[31341]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[31455]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[31374]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[31488]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[31442]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[31556]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[31463]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[31577]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[31500]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[31614]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[31528]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[31642]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[31570]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[31684]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[31613]: LoadName (offset 198) */
+   /* _mesa_function_pool[31727]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[31627]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[31741]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[31654]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[31768]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[31672]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[31786]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[31689]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[31803]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[31723]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[31837]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[31774]: CullFace (offset 152) */
+   /* _mesa_function_pool[31888]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[31788]: BindTexture (offset 307) */
+   /* _mesa_function_pool[31902]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[31823]: BeginFragmentShaderATI (will be remapped) */
-   "\0"
-   "glBeginFragmentShaderATI\0"
+   /* _mesa_function_pool[31937]: VertexAttribs2fvNV (will be remapped) */
+   "iip\0"
+   "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[31850]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[31963]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[31896]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[32009]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[31922]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[32035]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[31941]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[32054]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[31961]: Rectsv (offset 93) */
+   /* _mesa_function_pool[32074]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[31974]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[32087]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[32001]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[32114]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[32027]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[32140]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[32085]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32198]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32111]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[32224]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[32174]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[32287]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[32229]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[32342]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[32256]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[32369]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[32277]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[32390]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32299]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[32412]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32327]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[32440]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[32351]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[32464]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[32396]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[32509]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[32415]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[32528]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[32462]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[32575]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[32489]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[32602]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[32505]: Recti (offset 90) */
+   /* _mesa_function_pool[32618]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[32519]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[32632]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[32541]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[32654]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[32580]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[32693]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[32608]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32721]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32637]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32750]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[32676]: PixelTransformParameterfvEXT (dynamic) */
-   "iip\0"
-   "glPixelTransformParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[32712]: PrimitiveRestartNV (will be remapped) */
-   "\0"
-   "glPrimitiveRestartNV\0"
+   /* _mesa_function_pool[32789]: ImageTransformParameteriHP (dynamic) */
+   "iii\0"
+   "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[32735]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[32823]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[32757]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[32845]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[32778]: Rectf (offset 88) */
+   /* _mesa_function_pool[32866]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[32792]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[32880]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[32815]: Indexfv (offset 47) */
+   /* _mesa_function_pool[32903]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[32828]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[32916]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[32845]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[32933]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32891]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[32979]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[32943]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[33031]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[32978]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[33066]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[32998]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[33086]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[33025]: IndexMask (offset 212) */
+   /* _mesa_function_pool[33113]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[33040]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[33128]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[33077]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[33165]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[33120]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[33208]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[33136]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[33224]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[33162]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[33250]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[33181]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[33269]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[33203]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[33291]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[33222]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[33310]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[33239]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33327]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33266]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[33354]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[33280]: Fogfv (offset 154) */
+   /* _mesa_function_pool[33368]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[33292]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[33380]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[33326]: InitNames (offset 197) */
+   /* _mesa_function_pool[33414]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[33340]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[33428]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[33355]: Minmax (offset 368) */
+   /* _mesa_function_pool[33443]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[33381]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[33469]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[33400]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[33488]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[33527]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[33419]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[33546]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[33451]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[33578]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[33473]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[33600]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[33503]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[33630]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[33523]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[33650]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[33541]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[33668]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[33578]: Hint (offset 158) */
+   /* _mesa_function_pool[33705]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[33589]: Color4dv (offset 28) */
+   /* _mesa_function_pool[33716]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[33603]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[33730]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[33646]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[33773]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[33675]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[33802]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[33730]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[33857]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[33780]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[33907]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[33798]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[33925]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[33849]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[33976]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[33896]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[34023]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[33920]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[34047]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[33951]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[34078]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[33966]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[34093]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[34001]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[34128]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[34018]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[34145]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34038]: Begin (offset 7) */
+   /* _mesa_function_pool[34165]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[34049]: LightModeli (offset 165) */
+   /* _mesa_function_pool[34176]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[34067]: VertexAttribI4ivEXT (will be remapped) */
-   "ip\0"
-   "glVertexAttribI4ivEXT\0"
-   "glVertexAttribI4iv\0"
+   /* _mesa_function_pool[34194]: FogCoordPointerListIBM (dynamic) */
+   "iipi\0"
+   "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[34112]: Rectfv (offset 89) */
+   /* _mesa_function_pool[34225]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[34125]: BlendEquationSeparateiARB (will be remapped) */
-   "iii\0"
-   "glBlendEquationSeparateiARB\0"
-   "glBlendEquationSeparateIndexedAMD\0"
-   "\0"
-   /* _mesa_function_pool[34192]: LightModelf (offset 163) */
+   /* _mesa_function_pool[34238]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[34210]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[34256]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[34235]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[34281]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[34253]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[34299]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34289]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[34335]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[34315]: VertexAttrib1dNV (will be remapped) */
-   "id\0"
-   "glVertexAttrib1dNV\0"
+   /* _mesa_function_pool[34361]: VertexP4uiv (will be remapped) */
+   "ip\0"
+   "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[34338]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34379]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34377]: Disable (offset 214) */
+   /* _mesa_function_pool[34418]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[34390]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[34431]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[34435]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[34476]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34501]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34542]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34529]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[34570]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[34556]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[34597]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34590]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[34631]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[34609]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[34650]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[34659]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[34700]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[34701]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[34742]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[34727]: ColorMask (offset 210) */
+   /* _mesa_function_pool[34768]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[34745]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[34786]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[34770]: DebugMessageInsertARB (will be remapped) */
+   /* _mesa_function_pool[34811]: DebugMessageInsertARB (will be remapped) */
    "iiiiip\0"
    "glDebugMessageInsertARB\0"
    "\0"
-   /* _mesa_function_pool[34802]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[34843]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34832]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[34873]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[34865]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[34906]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[34887]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[34928]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[34905]: Enable (offset 215) */
+   /* _mesa_function_pool[34946]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[34917]: LineStipple (offset 167) */
+   /* _mesa_function_pool[34958]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[34935]: VertexAttribP2ui (will be remapped) */
-   "iiii\0"
-   "glVertexAttribP2ui\0"
+   /* _mesa_function_pool[34976]: FragmentLightfSGIX (dynamic) */
+   "iif\0"
+   "glFragmentLightfSGIX\0"
+   "\0"
+   /* _mesa_function_pool[35002]: SetFenceNV (will be remapped) */
+   "ii\0"
+   "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[34960]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[35019]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[34986]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[35045]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[35016]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[35075]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[35043]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[35102]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[35097]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[35156]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[35140]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[35199]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[35173]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[35232]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[35199]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[35258]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[35214]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[35273]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[35245]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[35304]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[35266]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[35325]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35296]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[35355]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[35336]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[35395]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[35373]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[35432]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[35397]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[35456]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[35422]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[35481]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[35443]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[35502]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -5128,685 +5136,687 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1680, AttachShader_remap_index },
-   { 10765, CreateProgram_remap_index },
-   { 24655, CreateShader_remap_index },
-   { 27229, DeleteProgram_remap_index },
-   { 19968, DeleteShader_remap_index },
-   { 25148, DetachShader_remap_index },
-   { 19198, GetAttachedShaders_remap_index },
-   {  5460, GetProgramInfoLog_remap_index },
-   {   444, GetProgramiv_remap_index },
-   {  7308, GetShaderInfoLog_remap_index },
-   { 33162, GetShaderiv_remap_index },
-   { 14314, IsProgram_remap_index },
-   { 13215, IsShader_remap_index },
-   { 10895, StencilFuncSeparate_remap_index },
-   {  4439, StencilMaskSeparate_remap_index },
-   {  8373, StencilOpSeparate_remap_index },
-   { 23889, UniformMatrix2x3fv_remap_index },
-   {  3166, UniformMatrix2x4fv_remap_index },
-   { 35016, UniformMatrix3x2fv_remap_index },
-   { 32462, UniformMatrix3x4fv_remap_index },
-   { 17372, UniformMatrix4x2fv_remap_index },
-   {  3657, UniformMatrix4x3fv_remap_index },
-   {  5683, ClampColor_remap_index },
-   { 19252, ClearBufferfi_remap_index },
-   { 18668, ClearBufferfv_remap_index },
-   { 31442, ClearBufferiv_remap_index },
-   { 14519, ClearBufferuiv_remap_index },
-   { 21391, GetStringi_remap_index },
-   { 19810, TexBuffer_remap_index },
-   {   977, FramebufferTexture_remap_index },
-   { 28284, GetBufferParameteri64v_remap_index },
-   { 10995, GetInteger64i_v_remap_index },
-   { 24969, VertexAttribDivisor_remap_index },
-   { 10783, LoadTransposeMatrixdARB_remap_index },
-   { 32891, LoadTransposeMatrixfARB_remap_index },
-   {  6368, MultTransposeMatrixdARB_remap_index },
-   { 25335, MultTransposeMatrixfARB_remap_index },
-   {   255, SampleCoverageARB_remap_index },
-   {  6571, CompressedTexImage1DARB_remap_index },
-   { 25863, CompressedTexImage2DARB_remap_index },
-   {  4502, CompressedTexImage3DARB_remap_index },
-   { 19540, CompressedTexSubImage1DARB_remap_index },
-   {  2236, CompressedTexSubImage2DARB_remap_index },
-   { 21813, CompressedTexSubImage3DARB_remap_index },
-   { 30509, GetCompressedTexImageARB_remap_index },
-   {  4249, DisableVertexAttribArrayARB_remap_index },
-   { 32027, EnableVertexAttribArrayARB_remap_index },
-   { 33966, GetProgramEnvParameterdvARB_remap_index },
-   { 25215, GetProgramEnvParameterfvARB_remap_index },
-   { 29313, GetProgramLocalParameterdvARB_remap_index },
-   {  8849, GetProgramLocalParameterfvARB_remap_index },
-   { 19716, GetProgramStringARB_remap_index },
-   { 29508, GetProgramivARB_remap_index },
-   { 22008, GetVertexAttribdvARB_remap_index },
-   { 17180, GetVertexAttribfvARB_remap_index },
-   { 10574, GetVertexAttribivARB_remap_index },
-   { 20828, ProgramEnvParameter4dARB_remap_index },
-   { 26979, ProgramEnvParameter4dvARB_remap_index },
-   { 17966, ProgramEnvParameter4fARB_remap_index },
-   {  9724, ProgramEnvParameter4fvARB_remap_index },
-   {  4465, ProgramLocalParameter4dARB_remap_index },
-   { 14024, ProgramLocalParameter4dvARB_remap_index },
-   { 31463, ProgramLocalParameter4fARB_remap_index },
-   { 27625, ProgramLocalParameter4fvARB_remap_index },
-   { 30202, ProgramStringARB_remap_index },
-   { 21122, VertexAttrib1dARB_remap_index },
-   { 16781, VertexAttrib1dvARB_remap_index },
-   {  4661, VertexAttrib1fARB_remap_index },
-   { 35097, VertexAttrib1fvARB_remap_index },
-   {  7899, VertexAttrib1sARB_remap_index },
-   {  2431, VertexAttrib1svARB_remap_index },
-   { 16194, VertexAttrib2dARB_remap_index },
-   { 18689, VertexAttrib2dvARB_remap_index },
-   {  1763, VertexAttrib2fARB_remap_index },
-   { 18802, VertexAttrib2fvARB_remap_index },
-   { 34659, VertexAttrib2sARB_remap_index },
-   { 33603, VertexAttrib2svARB_remap_index },
-   { 12199, VertexAttrib3dARB_remap_index },
-   {  9391, VertexAttrib3dvARB_remap_index },
-   {  1850, VertexAttrib3fARB_remap_index },
-   { 24206, VertexAttrib3fvARB_remap_index },
-   { 30049, VertexAttrib3sARB_remap_index },
-   { 21750, VertexAttrib3svARB_remap_index },
-   {  5503, VertexAttrib4NbvARB_remap_index },
-   { 19075, VertexAttrib4NivARB_remap_index },
-   { 24161, VertexAttrib4NsvARB_remap_index },
-   { 25167, VertexAttrib4NubARB_remap_index },
-   { 33849, VertexAttrib4NubvARB_remap_index },
-   { 20479, VertexAttrib4NuivARB_remap_index },
-   {  3487, VertexAttrib4NusvARB_remap_index },
-   { 11788, VertexAttrib4bvARB_remap_index },
-   { 28686, VertexAttrib4dARB_remap_index },
-   { 22823, VertexAttrib4dvARB_remap_index },
-   { 12353, VertexAttrib4fARB_remap_index },
-   { 12757, VertexAttrib4fvARB_remap_index },
-   { 11138, VertexAttrib4ivARB_remap_index },
-   { 18482, VertexAttrib4sARB_remap_index },
-   { 33077, VertexAttrib4svARB_remap_index },
-   { 17771, VertexAttrib4ubvARB_remap_index },
-   { 32351, VertexAttrib4uivARB_remap_index },
-   { 21561, VertexAttrib4usvARB_remap_index },
-   { 23684, VertexAttribPointerARB_remap_index },
-   { 34832, BindBufferARB_remap_index },
-   {  7606, BufferDataARB_remap_index },
-   {  1601, BufferSubDataARB_remap_index },
-   { 32637, DeleteBuffersARB_remap_index },
-   { 35140, GenBuffersARB_remap_index },
-   { 18845, GetBufferParameterivARB_remap_index },
-   { 17918, GetBufferPointervARB_remap_index },
-   {  1554, GetBufferSubDataARB_remap_index },
-   { 32299, IsBufferARB_remap_index },
-   { 28128, MapBufferARB_remap_index },
-   { 33292, UnmapBufferARB_remap_index },
-   {   351, BeginQueryARB_remap_index },
-   { 21217, DeleteQueriesARB_remap_index },
-   { 13076, EndQueryARB_remap_index },
-   { 31011, GenQueriesARB_remap_index },
-   {  2128, GetQueryObjectivARB_remap_index },
-   { 18526, GetQueryObjectuivARB_remap_index },
-   {  1907, GetQueryivARB_remap_index },
-   { 21468, IsQueryARB_remap_index },
-   {  9001, AttachObjectARB_remap_index },
-   { 19930, CompileShaderARB_remap_index },
-   {  3599, CreateProgramObjectARB_remap_index },
-   {  7551, CreateShaderObjectARB_remap_index },
-   { 15477, DeleteObjectARB_remap_index },
-   { 25654, DetachObjectARB_remap_index },
-   { 12821, GetActiveUniformARB_remap_index },
-   { 10216, GetAttachedObjectsARB_remap_index },
-   { 10523, GetHandleARB_remap_index },
-   { 34865, GetInfoLogARB_remap_index },
-   { 33920, GetObjectParameterfvARB_remap_index },
-   { 29187, GetObjectParameterivARB_remap_index },
-   { 30769, GetShaderSourceARB_remap_index },
-   { 29909, GetUniformLocationARB_remap_index },
-   { 25437, GetUniformfvARB_remap_index },
-   { 13599, GetUniformivARB_remap_index },
-   { 21606, LinkProgramARB_remap_index },
-   { 21664, ShaderSourceARB_remap_index },
-   {  8273, Uniform1fARB_remap_index },
-   { 31689, Uniform1fvARB_remap_index },
-   { 23632, Uniform1iARB_remap_index },
-   { 22461, Uniform1ivARB_remap_index },
-   {  2380, Uniform2fARB_remap_index },
-   { 15313, Uniform2fvARB_remap_index },
-   { 27996, Uniform2iARB_remap_index },
-   {  2517, Uniform2ivARB_remap_index },
-   { 20040, Uniform3fARB_remap_index },
-   { 10246, Uniform3fvARB_remap_index },
-   {  7162, Uniform3iARB_remap_index },
-   { 18024, Uniform3ivARB_remap_index },
-   { 20634, Uniform4fARB_remap_index },
-   { 25301, Uniform4fvARB_remap_index },
-   { 26588, Uniform4iARB_remap_index },
-   { 21974, Uniform4ivARB_remap_index },
-   {  9053, UniformMatrix2fvARB_remap_index },
+   {  1758, AttachShader_remap_index },
+   { 10938, CreateProgram_remap_index },
+   { 24675, CreateShader_remap_index },
+   { 27375, DeleteProgram_remap_index },
+   { 20075, DeleteShader_remap_index },
+   { 25204, DetachShader_remap_index },
+   { 19361, GetAttachedShaders_remap_index },
+   {  5435, GetProgramInfoLog_remap_index },
+   {   453, GetProgramiv_remap_index },
+   {  7379, GetShaderInfoLog_remap_index },
+   { 33250, GetShaderiv_remap_index },
+   { 14448, IsProgram_remap_index },
+   { 13350, IsShader_remap_index },
+   { 11068, StencilFuncSeparate_remap_index },
+   {  4312, StencilMaskSeparate_remap_index },
+   {  8508, StencilOpSeparate_remap_index },
+   { 23870, UniformMatrix2x3fv_remap_index },
+   {  3181, UniformMatrix2x4fv_remap_index },
+   { 35075, UniformMatrix3x2fv_remap_index },
+   { 32575, UniformMatrix3x4fv_remap_index },
+   { 17481, UniformMatrix4x2fv_remap_index },
+   {  3620, UniformMatrix4x3fv_remap_index },
+   {  5658, ClampColor_remap_index },
+   { 19415, ClearBufferfi_remap_index },
+   { 18831, ClearBufferfv_remap_index },
+   { 31556, ClearBufferiv_remap_index },
+   { 14646, ClearBufferuiv_remap_index },
+   { 21412, GetStringi_remap_index },
+   { 19917, TexBuffer_remap_index },
+   {   986, FramebufferTexture_remap_index },
+   { 28442, GetBufferParameteri64v_remap_index },
+   { 11168, GetInteger64i_v_remap_index },
+   { 25017, VertexAttribDivisor_remap_index },
+   { 10956, LoadTransposeMatrixdARB_remap_index },
+   { 32979, LoadTransposeMatrixfARB_remap_index },
+   {  6402, MultTransposeMatrixdARB_remap_index },
+   { 25391, MultTransposeMatrixfARB_remap_index },
+   {   264, SampleCoverageARB_remap_index },
+   {  6586, CompressedTexImage1DARB_remap_index },
+   { 25919, CompressedTexImage2DARB_remap_index },
+   {  4375, CompressedTexImage3DARB_remap_index },
+   { 19666, CompressedTexSubImage1DARB_remap_index },
+   {  2326, CompressedTexSubImage2DARB_remap_index },
+   { 21834, CompressedTexSubImage3DARB_remap_index },
+   { 30620, GetCompressedTexImageARB_remap_index },
+   {  4186, DisableVertexAttribArrayARB_remap_index },
+   { 32140, EnableVertexAttribArrayARB_remap_index },
+   { 34093, GetProgramEnvParameterdvARB_remap_index },
+   { 25271, GetProgramEnvParameterfvARB_remap_index },
+   { 29490, GetProgramLocalParameterdvARB_remap_index },
+   {  8978, GetProgramLocalParameterfvARB_remap_index },
+   { 19823, GetProgramStringARB_remap_index },
+   { 29685, GetProgramivARB_remap_index },
+   { 22029, GetVertexAttribdvARB_remap_index },
+   { 17314, GetVertexAttribfvARB_remap_index },
+   { 10747, GetVertexAttribivARB_remap_index },
+   { 20867, ProgramEnvParameter4dARB_remap_index },
+   { 27084, ProgramEnvParameter4dvARB_remap_index },
+   { 18133, ProgramEnvParameter4fARB_remap_index },
+   {  9886, ProgramEnvParameter4fvARB_remap_index },
+   {  4338, ProgramLocalParameter4dARB_remap_index },
+   { 14158, ProgramLocalParameter4dvARB_remap_index },
+   { 31577, ProgramLocalParameter4fARB_remap_index },
+   { 27761, ProgramLocalParameter4fvARB_remap_index },
+   { 30327, ProgramStringARB_remap_index },
+   { 21160, VertexAttrib1dARB_remap_index },
+   { 16915, VertexAttrib1dvARB_remap_index },
+   {  4534, VertexAttrib1fARB_remap_index },
+   { 35156, VertexAttrib1fvARB_remap_index },
+   {  8009, VertexAttrib1sARB_remap_index },
+   {  2521, VertexAttrib1svARB_remap_index },
+   { 16328, VertexAttrib2dARB_remap_index },
+   { 18852, VertexAttrib2dvARB_remap_index },
+   {  1808, VertexAttrib2fARB_remap_index },
+   { 18965, VertexAttrib2fvARB_remap_index },
+   { 34700, VertexAttrib2sARB_remap_index },
+   { 33730, VertexAttrib2svARB_remap_index },
+   { 12342, VertexAttrib3dARB_remap_index },
+   {  9553, VertexAttrib3dvARB_remap_index },
+   {  1895, VertexAttrib3fARB_remap_index },
+   { 24226, VertexAttrib3fvARB_remap_index },
+   { 30174, VertexAttrib3sARB_remap_index },
+   { 21771, VertexAttrib3svARB_remap_index },
+   {  5478, VertexAttrib4NbvARB_remap_index },
+   { 19238, VertexAttrib4NivARB_remap_index },
+   { 24181, VertexAttrib4NsvARB_remap_index },
+   { 25223, VertexAttrib4NubARB_remap_index },
+   { 33976, VertexAttrib4NubvARB_remap_index },
+   { 20518, VertexAttrib4NuivARB_remap_index },
+   {  3493, VertexAttrib4NusvARB_remap_index },
+   { 11956, VertexAttrib4bvARB_remap_index },
+   { 28812, VertexAttrib4dARB_remap_index },
+   { 22801, VertexAttrib4dvARB_remap_index },
+   { 12496, VertexAttrib4fARB_remap_index },
+   { 12900, VertexAttrib4fvARB_remap_index },
+   { 11342, VertexAttrib4ivARB_remap_index },
+   { 18645, VertexAttrib4sARB_remap_index },
+   { 33165, VertexAttrib4svARB_remap_index },
+   { 17938, VertexAttrib4ubvARB_remap_index },
+   { 32464, VertexAttrib4uivARB_remap_index },
+   { 21582, VertexAttrib4usvARB_remap_index },
+   { 23686, VertexAttribPointerARB_remap_index },
+   { 34873, BindBufferARB_remap_index },
+   {  7716, BufferDataARB_remap_index },
+   {  1626, BufferSubDataARB_remap_index },
+   { 32750, DeleteBuffersARB_remap_index },
+   { 35199, GenBuffersARB_remap_index },
+   { 19008, GetBufferParameterivARB_remap_index },
+   { 18085, GetBufferPointervARB_remap_index },
+   {  1579, GetBufferSubDataARB_remap_index },
+   { 32412, IsBufferARB_remap_index },
+   { 28286, MapBufferARB_remap_index },
+   { 33380, UnmapBufferARB_remap_index },
+   {   360, BeginQueryARB_remap_index },
+   { 21238, DeleteQueriesARB_remap_index },
+   { 13211, EndQueryARB_remap_index },
+   { 31099, GenQueriesARB_remap_index },
+   {  2218, GetQueryObjectivARB_remap_index },
+   { 18689, GetQueryObjectuivARB_remap_index },
+   {  1997, GetQueryivARB_remap_index },
+   { 21489, IsQueryARB_remap_index },
+   {  9163, AttachObjectARB_remap_index },
+   { 20037, CompileShaderARB_remap_index },
+   {  3562, CreateProgramObjectARB_remap_index },
+   {  7661, CreateShaderObjectARB_remap_index },
+   { 15611, DeleteObjectARB_remap_index },
+   { 25710, DetachObjectARB_remap_index },
+   { 12964, GetActiveUniformARB_remap_index },
+   { 10389, GetAttachedObjectsARB_remap_index },
+   { 10696, GetHandleARB_remap_index },
+   { 34906, GetInfoLogARB_remap_index },
+   { 34047, GetObjectParameterfvARB_remap_index },
+   { 29364, GetObjectParameterivARB_remap_index },
+   { 30857, GetShaderSourceARB_remap_index },
+   { 30034, GetUniformLocationARB_remap_index },
+   { 25493, GetUniformfvARB_remap_index },
+   { 13733, GetUniformivARB_remap_index },
+   { 21627, LinkProgramARB_remap_index },
+   { 21685, ShaderSourceARB_remap_index },
+   {  8408, Uniform1fARB_remap_index },
+   { 31803, Uniform1fvARB_remap_index },
+   { 23634, Uniform1iARB_remap_index },
+   { 22439, Uniform1ivARB_remap_index },
+   {  2470, Uniform2fARB_remap_index },
+   { 15447, Uniform2fvARB_remap_index },
+   { 28153, Uniform2iARB_remap_index },
+   {  2590, Uniform2ivARB_remap_index },
+   { 20147, Uniform3fARB_remap_index },
+   { 10419, Uniform3fvARB_remap_index },
+   {  7190, Uniform3iARB_remap_index },
+   { 18191, Uniform3ivARB_remap_index },
+   { 20673, Uniform4fARB_remap_index },
+   { 25357, Uniform4fvARB_remap_index },
+   { 26694, Uniform4iARB_remap_index },
+   { 21995, Uniform4ivARB_remap_index },
+   {  9215, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2953, UniformMatrix4fvARB_remap_index },
-   { 27091, UseProgramObjectARB_remap_index },
-   { 15882, ValidateProgramARB_remap_index },
-   { 22866, BindAttribLocationARB_remap_index },
-   {  5548, GetActiveAttribARB_remap_index },
-   { 17705, GetAttribLocationARB_remap_index },
-   { 31374, DrawBuffersARB_remap_index },
-   { 31207, ClampColorARB_remap_index },
-   { 19120, DrawArraysInstancedARB_remap_index },
-   {  7223, DrawElementsInstancedARB_remap_index },
-   { 14129, RenderbufferStorageMultisample_remap_index },
-   { 14600, FramebufferTextureARB_remap_index },
-   { 27527, FramebufferTextureFaceARB_remap_index },
-   { 25803, ProgramParameteriARB_remap_index },
-   {  6743, VertexAttribDivisorARB_remap_index },
-   { 20682, FlushMappedBufferRange_remap_index },
-   { 29624, MapBufferRange_remap_index },
-   { 29531, TexBufferARB_remap_index },
-   { 17510, BindVertexArray_remap_index },
-   { 15686, GenVertexArrays_remap_index },
-   { 32229, CopyBufferSubData_remap_index },
-   { 33181, ClientWaitSync_remap_index },
-   {  2872, DeleteSync_remap_index },
-   {  7940, FenceSync_remap_index },
-   { 16253, GetInteger64v_remap_index },
-   { 24268, GetSynciv_remap_index },
-   { 31313, IsSync_remap_index },
-   { 10147, WaitSync_remap_index },
-   {  4217, DrawElementsBaseVertex_remap_index },
-   { 19768, DrawElementsInstancedBaseVertex_remap_index },
-   { 32541, DrawRangeElementsBaseVertex_remap_index },
-   { 28159, MultiDrawElementsBaseVertex_remap_index },
-   { 34125, BlendEquationSeparateiARB_remap_index },
-   { 18938, BlendEquationiARB_remap_index },
-   { 13538, BlendFuncSeparateiARB_remap_index },
-   { 10622, BlendFunciARB_remap_index },
-   {  8915, BindSampler_remap_index },
-   {  4640, DeleteSamplers_remap_index },
-   { 21055, GenSamplers_remap_index },
-   { 31245, GetSamplerParameterIiv_remap_index },
-   { 20576, GetSamplerParameterIuiv_remap_index },
-   {  5380, GetSamplerParameterfv_remap_index },
-   { 27248, GetSamplerParameteriv_remap_index },
-   { 15231, IsSampler_remap_index },
-   { 17463, SamplerParameterIiv_remap_index },
-   { 32580, SamplerParameterIuiv_remap_index },
-   { 23941, SamplerParameterf_remap_index },
-   { 17637, SamplerParameterfv_remap_index },
-   { 23916, SamplerParameteri_remap_index },
-   { 19314, SamplerParameteriv_remap_index },
-   { 20138, ColorP3ui_remap_index },
-   { 32828, ColorP3uiv_remap_index },
-   { 22567, ColorP4ui_remap_index },
-   {  4407, ColorP4uiv_remap_index },
-   { 26790, MultiTexCoordP1ui_remap_index },
-   { 13512, MultiTexCoordP1uiv_remap_index },
-   {  1738, MultiTexCoordP2ui_remap_index },
-   { 32001, MultiTexCoordP2uiv_remap_index },
-   { 14843, MultiTexCoordP3ui_remap_index },
-   { 11214, MultiTexCoordP3uiv_remap_index },
-   { 23465, MultiTexCoordP4ui_remap_index },
-   {  4079, MultiTexCoordP4uiv_remap_index },
-   { 31672, NormalP3ui_remap_index },
-   { 20314, NormalP3uiv_remap_index },
-   { 26493, SecondaryColorP3ui_remap_index },
-   { 20332, SecondaryColorP3uiv_remap_index },
-   {  2853, TexCoordP1ui_remap_index },
-   {  2620, TexCoordP1uiv_remap_index },
-   { 15762, TexCoordP2ui_remap_index },
-   { 23490, TexCoordP2uiv_remap_index },
-   {  6450, TexCoordP3ui_remap_index },
-   { 23869, TexCoordP3uiv_remap_index },
-   {  2036, TexCoordP4ui_remap_index },
-   {  5952, TexCoordP4uiv_remap_index },
-   { 10665, VertexAttribP1ui_remap_index },
-   { 15030, VertexAttribP1uiv_remap_index },
-   { 34935, VertexAttribP2ui_remap_index },
-   {  5744, VertexAttribP2uiv_remap_index },
-   {  3552, VertexAttribP3ui_remap_index },
-   { 21073, VertexAttribP3uiv_remap_index },
-   { 15056, VertexAttribP4ui_remap_index },
-   { 17038, VertexAttribP4uiv_remap_index },
-   {  5486, VertexP2ui_remap_index },
-   { 16608, VertexP2uiv_remap_index },
-   {  2500, VertexP3ui_remap_index },
-   { 17558, VertexP3uiv_remap_index },
-   { 10175, VertexP4ui_remap_index },
-   {  3534, VertexP4uiv_remap_index },
-   {  5770, BindTransformFeedback_remap_index },
-   {  3626, DeleteTransformFeedbacks_remap_index },
-   {  7195, DrawTransformFeedback_remap_index },
-   { 10383, GenTransformFeedbacks_remap_index },
-   { 30092, IsTransformFeedback_remap_index },
-   { 27720, PauseTransformFeedback_remap_index },
-   {  6253, ResumeTransformFeedback_remap_index },
-   { 23186, ClearDepthf_remap_index },
-   {  7499, DepthRangef_remap_index },
-   { 15498, GetShaderPrecisionFormat_remap_index },
-   { 10835, ReleaseShaderCompiler_remap_index },
-   { 11831, ShaderBinary_remap_index },
-   {  1482, DebugMessageCallbackARB_remap_index },
-   { 10541, DebugMessageControlARB_remap_index },
-   { 34770, DebugMessageInsertARB_remap_index },
-   {  3051, GetDebugMessageLogARB_remap_index },
-   {  1004, GetGraphicsResetStatusARB_remap_index },
-   { 26368, GetnColorTableARB_remap_index },
-   {  8684, GetnCompressedTexImageARB_remap_index },
-   {  4356, GetnConvolutionFilterARB_remap_index },
-   { 16824, GetnHistogramARB_remap_index },
-   { 25127, GetnMapdvARB_remap_index },
-   { 23663, GetnMapfvARB_remap_index },
-   {  2359, GetnMapivARB_remap_index },
-   { 18286, GetnMinmaxARB_remap_index },
-   {  4976, GetnPixelMapfvARB_remap_index },
-   { 20453, GetnPixelMapuivARB_remap_index },
-   {  3279, GetnPixelMapusvARB_remap_index },
-   {  1404, GetnPolygonStippleARB_remap_index },
-   { 22651, GetnSeparableFilterARB_remap_index },
-   { 34701, GetnTexImageARB_remap_index },
-   { 19743, GetnUniformdvARB_remap_index },
-   {  5077, GetnUniformfvARB_remap_index },
-   { 10690, GetnUniformivARB_remap_index },
-   { 24117, GetnUniformuivARB_remap_index },
-   {  3193, ReadnPixelsARB_remap_index },
-   {  1291, TexStorage1D_remap_index },
-   {  4866, TexStorage2D_remap_index },
-   { 30698, TexStorage3D_remap_index },
-   {  5001, TextureStorage1DEXT_remap_index },
-   { 30479, TextureStorage2DEXT_remap_index },
-   { 30273, TextureStorage3DEXT_remap_index },
-   {  6121, PolygonOffsetEXT_remap_index },
-   { 24890, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4926, GetPixelTexGenParameterivSGIS_remap_index },
-   { 24623, PixelTexGenParameterfSGIS_remap_index },
-   {   663, PixelTexGenParameterfvSGIS_remap_index },
-   { 13637, PixelTexGenParameteriSGIS_remap_index },
-   { 14742, PixelTexGenParameterivSGIS_remap_index },
-   { 19439, SampleMaskSGIS_remap_index },
-   { 21408, SamplePatternSGIS_remap_index },
-   { 28069, ColorPointerEXT_remap_index },
-   { 18732, EdgeFlagPointerEXT_remap_index },
-   {  6816, IndexPointerEXT_remap_index },
-   {  6896, NormalPointerEXT_remap_index },
-   { 16892, TexCoordPointerEXT_remap_index },
-   {  7729, VertexPointerEXT_remap_index },
-   {  3993, PointParameterfEXT_remap_index },
-   {  8580, PointParameterfvEXT_remap_index },
-   { 34018, LockArraysEXT_remap_index },
-   { 15946, UnlockArraysEXT_remap_index },
-   {  1312, SecondaryColor3bEXT_remap_index },
-   {  8773, SecondaryColor3bvEXT_remap_index },
-   { 11341, SecondaryColor3dEXT_remap_index },
-   { 27297, SecondaryColor3dvEXT_remap_index },
-   { 29958, SecondaryColor3fEXT_remap_index },
-   { 19476, SecondaryColor3fvEXT_remap_index },
-   {   509, SecondaryColor3iEXT_remap_index },
-   { 17228, SecondaryColor3ivEXT_remap_index },
-   { 10923, SecondaryColor3sEXT_remap_index },
-   { 32845, SecondaryColor3svEXT_remap_index },
-   { 29023, SecondaryColor3ubEXT_remap_index },
-   { 22757, SecondaryColor3ubvEXT_remap_index },
-   { 13879, SecondaryColor3uiEXT_remap_index },
-   { 24510, SecondaryColor3uivEXT_remap_index },
-   { 27577, SecondaryColor3usEXT_remap_index },
-   { 13952, SecondaryColor3usvEXT_remap_index },
-   { 12700, SecondaryColorPointerEXT_remap_index },
-   { 27391, MultiDrawArraysEXT_remap_index },
-   { 22396, MultiDrawElementsEXT_remap_index },
-   { 22607, FogCoordPointerEXT_remap_index },
-   {  5128, FogCoorddEXT_remap_index },
-   { 33419, FogCoorddvEXT_remap_index },
-   {  5245, FogCoordfEXT_remap_index },
-   { 28946, FogCoordfvEXT_remap_index },
-   { 12800, PixelTexGenSGIX_remap_index },
-   { 29551, BlendFuncSeparateEXT_remap_index },
-   {  7641, FlushVertexArrayRangeNV_remap_index },
-   {  6070, VertexArrayRangeNV_remap_index },
-   { 30023, CombinerInputNV_remap_index },
-   {  2302, CombinerOutputNV_remap_index },
-   { 32998, CombinerParameterfNV_remap_index },
-   {  5924, CombinerParameterfvNV_remap_index },
-   { 23966, CombinerParameteriNV_remap_index },
-   { 34501, CombinerParameterivNV_remap_index },
-   {  8017, FinalCombinerInputNV_remap_index },
-   {  1699, GetCombinerInputParameterfvNV_remap_index },
-   { 34338, GetCombinerInputParameterivNV_remap_index },
-   {   216, GetCombinerOutputParameterfvNV_remap_index },
-   { 14703, GetCombinerOutputParameterivNV_remap_index },
-   {  7403, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 26435, GetFinalCombinerInputParameterivNV_remap_index },
-   { 13490, ResizeBuffersMESA_remap_index },
-   { 12026, WindowPos2dMESA_remap_index },
-   {  1084, WindowPos2dvMESA_remap_index },
-   { 35443, WindowPos2fMESA_remap_index },
-   {  8718, WindowPos2fvMESA_remap_index },
-   { 19386, WindowPos2iMESA_remap_index },
-   { 21881, WindowPos2ivMESA_remap_index },
-   { 22495, WindowPos2sMESA_remap_index },
-   {  6485, WindowPos2svMESA_remap_index },
-   {  8509, WindowPos3dMESA_remap_index },
-   { 14975, WindowPos3dvMESA_remap_index },
-   {   555, WindowPos3fMESA_remap_index },
-   { 16007, WindowPos3fvMESA_remap_index },
-   { 25696, WindowPos3iMESA_remap_index },
-   { 32174, WindowPos3ivMESA_remap_index },
-   { 20201, WindowPos3sMESA_remap_index },
-   { 33675, WindowPos3svMESA_remap_index },
-   { 11977, WindowPos4dMESA_remap_index },
-   { 18162, WindowPos4dvMESA_remap_index },
-   { 14934, WindowPos4fMESA_remap_index },
-   { 32735, WindowPos4fvMESA_remap_index },
-   { 32327, WindowPos4iMESA_remap_index },
-   { 13329, WindowPos4ivMESA_remap_index },
-   { 20429, WindowPos4sMESA_remap_index },
-   {  3577, WindowPos4svMESA_remap_index },
-   { 28654, MultiModeDrawArraysIBM_remap_index },
-   { 30882, MultiModeDrawElementsIBM_remap_index },
-   { 13104, DeleteFencesNV_remap_index },
-   { 29870, FinishFenceNV_remap_index },
-   {  4141, GenFencesNV_remap_index },
-   { 18142, GetFenceivNV_remap_index },
-   {  8986, IsFenceNV_remap_index },
-   { 14630, SetFenceNV_remap_index },
-   {  4717, TestFenceNV_remap_index },
-   { 33646, AreProgramsResidentNV_remap_index },
-   { 33040, BindProgramNV_remap_index },
-   { 27660, DeleteProgramsNV_remap_index },
-   { 22975, ExecuteProgramNV_remap_index },
-   { 35336, GenProgramsNV_remap_index },
-   { 24995, GetProgramParameterdvNV_remap_index },
-   { 11403, GetProgramParameterfvNV_remap_index },
-   { 28043, GetProgramStringNV_remap_index },
-   { 26073, GetProgramivNV_remap_index },
-   { 25250, GetTrackMatrixivNV_remap_index },
-   { 27837, GetVertexAttribPointervNV_remap_index },
-   { 11018, GetVertexAttribdvNV_remap_index },
-   { 10042, GetVertexAttribfvNV_remap_index },
-   { 19689, GetVertexAttribivNV_remap_index },
-   { 20712, IsProgramNV_remap_index },
-   { 10125, LoadProgramNV_remap_index },
-   { 29647, ProgramParameters4dvNV_remap_index },
-   { 26003, ProgramParameters4fvNV_remap_index },
-   { 22185, RequestResidentProgramsNV_remap_index },
-   { 32519, TrackMatrixNV_remap_index },
-   { 34315, VertexAttrib1dNV_remap_index },
-   { 14541, VertexAttrib1dvNV_remap_index },
-   { 30335, VertexAttrib1fNV_remap_index },
-   {  2659, VertexAttrib1fvNV_remap_index },
-   { 32792, VertexAttrib1sNV_remap_index },
-   { 16080, VertexAttrib1svNV_remap_index },
-   {  5436, VertexAttrib2dNV_remap_index },
-   { 14434, VertexAttrib2dvNV_remap_index },
-   { 21640, VertexAttrib2fNV_remap_index },
-   { 14000, VertexAttrib2fvNV_remap_index },
-   {  6697, VertexAttrib2sNV_remap_index },
-   { 20255, VertexAttrib2svNV_remap_index },
-   { 12174, VertexAttrib3dNV_remap_index },
-   { 33896, VertexAttrib3dvNV_remap_index },
-   { 11189, VertexAttrib3fNV_remap_index },
-   { 26395, VertexAttrib3fvNV_remap_index },
-   { 23739, VertexAttrib3sNV_remap_index },
-   { 25277, VertexAttrib3svNV_remap_index },
-   { 30856, VertexAttrib4dNV_remap_index },
-   { 35373, VertexAttrib4dvNV_remap_index },
-   {  5864, VertexAttrib4fNV_remap_index },
-   { 10192, VertexAttrib4fvNV_remap_index },
-   { 28538, VertexAttrib4sNV_remap_index },
-   {  1512, VertexAttrib4svNV_remap_index },
-   {  5611, VertexAttrib4ubNV_remap_index },
-   {   817, VertexAttrib4ubvNV_remap_index },
-   { 23155, VertexAttribPointerNV_remap_index },
-   {  2474, VertexAttribs1dvNV_remap_index },
-   { 27925, VertexAttribs1fvNV_remap_index },
-   { 35173, VertexAttribs1svNV_remap_index },
-   { 11240, VertexAttribs2dvNV_remap_index },
-   { 27052, VertexAttribs2fvNV_remap_index },
-   { 18758, VertexAttribs2svNV_remap_index },
-   {  5972, VertexAttribs3dvNV_remap_index },
-   {  2333, VertexAttribs3fvNV_remap_index },
-   { 31896, VertexAttribs3svNV_remap_index },
-   { 28628, VertexAttribs4dvNV_remap_index },
-   {  6044, VertexAttribs4fvNV_remap_index },
-   { 34960, VertexAttribs4svNV_remap_index },
-   { 31627, VertexAttribs4ubvNV_remap_index },
-   { 28730, GetTexBumpParameterfvATI_remap_index },
-   { 35214, GetTexBumpParameterivATI_remap_index },
-   { 19883, TexBumpParameterfvATI_remap_index },
-   { 22056, TexBumpParameterivATI_remap_index },
-   { 16644, AlphaFragmentOp1ATI_remap_index },
-   { 27343, AlphaFragmentOp2ATI_remap_index },
-   { 26311, AlphaFragmentOp3ATI_remap_index },
-   { 31823, BeginFragmentShaderATI_remap_index },
-   { 33239, BindFragmentShaderATI_remap_index },
-   { 25406, ColorFragmentOp1ATI_remap_index },
-   {  4832, ColorFragmentOp2ATI_remap_index },
-   { 33541, ColorFragmentOp3ATI_remap_index },
-   {  6210, DeleteFragmentShaderATI_remap_index },
-   { 35397, EndFragmentShaderATI_remap_index },
-   { 34529, GenFragmentShadersATI_remap_index },
-   { 27206, PassTexCoordATI_remap_index },
-   {  7709, SampleMapATI_remap_index },
-   { 28841, SetFragmentShaderConstantATI_remap_index },
-   {   402, PointParameteriNV_remap_index },
-   { 15187, PointParameterivNV_remap_index },
-   { 30672, ActiveStencilFaceEXT_remap_index },
-   { 29287, BindVertexArrayAPPLE_remap_index },
-   {  3000, DeleteVertexArraysAPPLE_remap_index },
-   { 19225, GenVertexArraysAPPLE_remap_index },
-   { 25060, IsVertexArrayAPPLE_remap_index },
-   {   858, GetProgramNamedParameterdvNV_remap_index },
-   {  3956, GetProgramNamedParameterfvNV_remap_index },
-   { 28761, ProgramNamedParameter4dNV_remap_index },
-   { 15561, ProgramNamedParameter4dvNV_remap_index },
-   {  9658, ProgramNamedParameter4fNV_remap_index },
-   { 12665, ProgramNamedParameter4fvNV_remap_index },
-   { 18073, PrimitiveRestartIndexNV_remap_index },
-   { 32712, PrimitiveRestartNV_remap_index },
-   { 25982, DepthBoundsEXT_remap_index },
-   {  1183, BlendEquationSeparateEXT_remap_index },
-   { 15781, BindFramebufferEXT_remap_index },
-   { 27436, BindRenderbufferEXT_remap_index },
-   { 10439, CheckFramebufferStatusEXT_remap_index },
-   { 24311, DeleteFramebuffersEXT_remap_index },
-   { 33798, DeleteRenderbuffersEXT_remap_index },
-   { 14458, FramebufferRenderbufferEXT_remap_index },
-   { 14647, FramebufferTexture1DEXT_remap_index },
-   { 12459, FramebufferTexture2DEXT_remap_index },
-   { 12079, FramebufferTexture3DEXT_remap_index },
-   { 24926, GenFramebuffersEXT_remap_index },
-   { 18623, GenRenderbuffersEXT_remap_index },
-   {  7445, GenerateMipmapEXT_remap_index },
-   { 23248, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 34435, GetRenderbufferParameterivEXT_remap_index },
-   { 21936, IsFramebufferEXT_remap_index },
-   { 35296, IsRenderbufferEXT_remap_index },
-   {  8933, RenderbufferStorageEXT_remap_index },
-   {   734, BlitFramebufferEXT_remap_index },
-   { 15347, BufferParameteriAPPLE_remap_index },
-   { 20744, FlushMappedBufferRangeAPPLE_remap_index },
-   {  1982, BindFragDataLocationEXT_remap_index },
-   { 26095, GetFragDataLocationEXT_remap_index },
-   { 11518, GetUniformuivEXT_remap_index },
-   { 34609, GetVertexAttribIivEXT_remap_index },
-   { 29818, GetVertexAttribIuivEXT_remap_index },
-   { 12937, Uniform1uiEXT_remap_index },
-   { 29732, Uniform1uivEXT_remap_index },
-   { 23835, Uniform2uiEXT_remap_index },
-   {  4796, Uniform2uivEXT_remap_index },
-   { 31135, Uniform3uiEXT_remap_index },
-   { 15708, Uniform3uivEXT_remap_index },
-   {  3880, Uniform4uiEXT_remap_index },
-   {  9434, Uniform4uivEXT_remap_index },
-   { 19604, VertexAttribI1iEXT_remap_index },
-   {  5638, VertexAttribI1ivEXT_remap_index },
-   {  2760, VertexAttribI1uiEXT_remap_index },
-   { 13728, VertexAttribI1uivEXT_remap_index },
+   {  3007, UniformMatrix4fvARB_remap_index },
+   { 27237, UseProgramObjectARB_remap_index },
+   { 16016, ValidateProgramARB_remap_index },
+   { 22844, BindAttribLocationARB_remap_index },
+   {  5523, GetActiveAttribARB_remap_index },
+   { 17872, GetAttribLocationARB_remap_index },
+   { 31488, DrawBuffersARB_remap_index },
+   { 31295, ClampColorARB_remap_index },
+   { 19283, DrawArraysInstancedARB_remap_index },
+   {  7251, DrawElementsInstancedARB_remap_index },
+   { 14263, RenderbufferStorageMultisample_remap_index },
+   { 14727, FramebufferTextureARB_remap_index },
+   { 27663, FramebufferTextureFaceARB_remap_index },
+   { 25859, ProgramParameteriARB_remap_index },
+   { 25175, VertexAttribDivisorARB_remap_index },
+   { 20721, FlushMappedBufferRange_remap_index },
+   { 29801, MapBufferRange_remap_index },
+   { 29708, TexBufferARB_remap_index },
+   { 17619, BindVertexArray_remap_index },
+   { 15820, GenVertexArrays_remap_index },
+   { 32342, CopyBufferSubData_remap_index },
+   { 33269, ClientWaitSync_remap_index },
+   {  2926, DeleteSync_remap_index },
+   {  8050, FenceSync_remap_index },
+   { 16387, GetInteger64v_remap_index },
+   { 24288, GetSynciv_remap_index },
+   { 31427, IsSync_remap_index },
+   { 10319, WaitSync_remap_index },
+   {  4154, DrawElementsBaseVertex_remap_index },
+   { 19875, DrawElementsInstancedBaseVertex_remap_index },
+   { 32654, DrawRangeElementsBaseVertex_remap_index },
+   { 28317, MultiDrawElementsBaseVertex_remap_index },
+   { 27157, BlendEquationSeparateiARB_remap_index },
+   { 19101, BlendEquationiARB_remap_index },
+   { 13672, BlendFuncSeparateiARB_remap_index },
+   { 10795, BlendFunciARB_remap_index },
+   {  5719, BindFragDataLocationIndexed_remap_index },
+   { 23202, GetFragDataIndex_remap_index },
+   {  9044, BindSampler_remap_index },
+   {  4513, DeleteSamplers_remap_index },
+   { 21094, GenSamplers_remap_index },
+   { 31333, GetSamplerParameterIiv_remap_index },
+   { 20615, GetSamplerParameterIuiv_remap_index },
+   {  5355, GetSamplerParameterfv_remap_index },
+   { 27394, GetSamplerParameteriv_remap_index },
+   { 15400, IsSampler_remap_index },
+   { 17572, SamplerParameterIiv_remap_index },
+   { 32693, SamplerParameterIuiv_remap_index },
+   { 23922, SamplerParameterf_remap_index },
+   { 17799, SamplerParameterfv_remap_index },
+   { 23897, SamplerParameteri_remap_index },
+   { 19477, SamplerParameteriv_remap_index },
+   { 15431, ColorP3ui_remap_index },
+   { 32916, ColorP3uiv_remap_index },
+   { 22545, ColorP4ui_remap_index },
+   { 14568, ColorP4uiv_remap_index },
+   { 10364, MultiTexCoordP1ui_remap_index },
+   { 13646, MultiTexCoordP1uiv_remap_index },
+   { 18583, MultiTexCoordP2ui_remap_index },
+   { 32114, MultiTexCoordP2uiv_remap_index },
+   { 15011, MultiTexCoordP3ui_remap_index },
+   { 11418, MultiTexCoordP3uiv_remap_index },
+   { 23487, MultiTexCoordP4ui_remap_index },
+   { 14757, MultiTexCoordP4uiv_remap_index },
+   { 31786, NormalP3ui_remap_index },
+   { 20369, NormalP3uiv_remap_index },
+   { 26599, SecondaryColorP3ui_remap_index },
+   { 20387, SecondaryColorP3uiv_remap_index },
+   {  1013, TexCoordP1ui_remap_index },
+   {  2693, TexCoordP1uiv_remap_index },
+   { 15896, TexCoordP2ui_remap_index },
+   { 12021, TexCoordP2uiv_remap_index },
+   { 13605, TexCoordP3ui_remap_index },
+   { 22238, TexCoordP3uiv_remap_index },
+   {  2126, TexCoordP4ui_remap_index },
+   {  5986, TexCoordP4uiv_remap_index },
+   { 10838, VertexAttribP1ui_remap_index },
+   { 13014, VertexAttribP1uiv_remap_index },
+   {  8613, VertexAttribP2ui_remap_index },
+   { 30571, VertexAttribP2uiv_remap_index },
+   {  5052, VertexAttribP3ui_remap_index },
+   { 28226, VertexAttribP3uiv_remap_index },
+   { 15225, VertexAttribP4ui_remap_index },
+   { 17172, VertexAttribP4uiv_remap_index },
+   {  5461, VertexP2ui_remap_index },
+   { 16742, VertexP2uiv_remap_index },
+   {  3294, VertexP3ui_remap_index },
+   { 21201, VertexP3uiv_remap_index },
+   { 10347, VertexP4ui_remap_index },
+   { 34361, VertexP4uiv_remap_index },
+   {  5755, BindTransformFeedback_remap_index },
+   { 11218, DeleteTransformFeedbacks_remap_index },
+   {  7223, DrawTransformFeedback_remap_index },
+   { 10556, GenTransformFeedbacks_remap_index },
+   { 30217, IsTransformFeedback_remap_index },
+   {  1181, PauseTransformFeedback_remap_index },
+   {  6287, ResumeTransformFeedback_remap_index },
+   { 23185, ClearDepthf_remap_index },
+   {  7609, DepthRangef_remap_index },
+   { 15632, GetShaderPrecisionFormat_remap_index },
+   { 11008, ReleaseShaderCompiler_remap_index },
+   { 11999, ShaderBinary_remap_index },
+   {  1507, DebugMessageCallbackARB_remap_index },
+   { 10714, DebugMessageControlARB_remap_index },
+   { 34811, DebugMessageInsertARB_remap_index },
+   {  3105, GetDebugMessageLogARB_remap_index },
+   { 30515, GetGraphicsResetStatusARB_remap_index },
+   { 26474, GetnColorTableARB_remap_index },
+   {  8813, GetnCompressedTexImageARB_remap_index },
+   {  4246, GetnConvolutionFilterARB_remap_index },
+   { 16958, GetnHistogramARB_remap_index },
+   {  4955, GetnMapdvARB_remap_index },
+   { 23665, GetnMapfvARB_remap_index },
+   {  2449, GetnMapivARB_remap_index },
+   { 18453, GetnMinmaxARB_remap_index },
+   {  4930, GetnPixelMapfvARB_remap_index },
+   { 20492, GetnPixelMapuivARB_remap_index },
+   { 31401, GetnPixelMapusvARB_remap_index },
+   {  1429, GetnPolygonStippleARB_remap_index },
+   { 22629, GetnSeparableFilterARB_remap_index },
+   { 34742, GetnTexImageARB_remap_index },
+   { 19850, GetnUniformdvARB_remap_index },
+   {  8081, GetnUniformfvARB_remap_index },
+   { 10863, GetnUniformivARB_remap_index },
+   { 24137, GetnUniformuivARB_remap_index },
+   {  3208, ReadnPixelsARB_remap_index },
+   {  1316, TexStorage1D_remap_index },
+   {  4820, TexStorage2D_remap_index },
+   { 17425, TexStorage3D_remap_index },
+   {  4976, TextureStorage1DEXT_remap_index },
+   {  5783, TextureStorage2DEXT_remap_index },
+   {  1777, TextureStorage3DEXT_remap_index },
+   {  6155, PolygonOffsetEXT_remap_index },
+   { 24910, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4880, GetPixelTexGenParameterivSGIS_remap_index },
+   { 24643, PixelTexGenParameterfSGIS_remap_index },
+   {   672, PixelTexGenParameterfvSGIS_remap_index },
+   { 13771, PixelTexGenParameteriSGIS_remap_index },
+   { 14910, PixelTexGenParameterivSGIS_remap_index },
+   { 17742, SampleMaskSGIS_remap_index },
+   { 21429, SamplePatternSGIS_remap_index },
+   { 21112, ColorPointerEXT_remap_index },
+   { 18895, EdgeFlagPointerEXT_remap_index },
+   {  6844, IndexPointerEXT_remap_index },
+   {  6924, NormalPointerEXT_remap_index },
+   { 17026, TexCoordPointerEXT_remap_index },
+   {  7839, VertexPointerEXT_remap_index },
+   {  3956, PointParameterfEXT_remap_index },
+   {  8709, PointParameterfvEXT_remap_index },
+   { 34145, LockArraysEXT_remap_index },
+   { 16080, UnlockArraysEXT_remap_index },
+   {  1337, SecondaryColor3bEXT_remap_index },
+   {  8902, SecondaryColor3bvEXT_remap_index },
+   { 11545, SecondaryColor3dEXT_remap_index },
+   { 27443, SecondaryColor3dvEXT_remap_index },
+   { 30083, SecondaryColor3fEXT_remap_index },
+   { 19602, SecondaryColor3fvEXT_remap_index },
+   {   518, SecondaryColor3iEXT_remap_index },
+   { 17362, SecondaryColor3ivEXT_remap_index },
+   { 11096, SecondaryColor3sEXT_remap_index },
+   { 32933, SecondaryColor3svEXT_remap_index },
+   { 29200, SecondaryColor3ubEXT_remap_index },
+   { 22735, SecondaryColor3ubvEXT_remap_index },
+   { 14013, SecondaryColor3uiEXT_remap_index },
+   { 24530, SecondaryColor3uivEXT_remap_index },
+   { 27713, SecondaryColor3usEXT_remap_index },
+   { 14086, SecondaryColor3usvEXT_remap_index },
+   { 12843, SecondaryColorPointerEXT_remap_index },
+   { 27527, MultiDrawArraysEXT_remap_index },
+   { 22374, MultiDrawElementsEXT_remap_index },
+   { 22585, FogCoordPointerEXT_remap_index },
+   {  5103, FogCoorddEXT_remap_index },
+   { 33546, FogCoorddvEXT_remap_index },
+   {  5220, FogCoordfEXT_remap_index },
+   { 29123, FogCoordfvEXT_remap_index },
+   { 12943, PixelTexGenSGIX_remap_index },
+   { 29728, BlendFuncSeparateEXT_remap_index },
+   {  7751, FlushVertexArrayRangeNV_remap_index },
+   {  6104, VertexArrayRangeNV_remap_index },
+   { 30148, CombinerInputNV_remap_index },
+   {  2392, CombinerOutputNV_remap_index },
+   { 33086, CombinerParameterfNV_remap_index },
+   {  5958, CombinerParameterfvNV_remap_index },
+   { 23947, CombinerParameteriNV_remap_index },
+   { 34542, CombinerParameterivNV_remap_index },
+   {  8152, FinalCombinerInputNV_remap_index },
+   {  7404, GetCombinerInputParameterfvNV_remap_index },
+   { 34379, GetCombinerInputParameterivNV_remap_index },
+   { 27856, GetCombinerOutputParameterfvNV_remap_index },
+   { 14839, GetCombinerOutputParameterivNV_remap_index },
+   {  7513, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 26541, GetFinalCombinerInputParameterivNV_remap_index },
+   { 13624, ResizeBuffersMESA_remap_index },
+   { 12169, WindowPos2dMESA_remap_index },
+   {  1082, WindowPos2dvMESA_remap_index },
+   { 35502, WindowPos2fMESA_remap_index },
+   {  8847, WindowPos2fvMESA_remap_index },
+   { 19549, WindowPos2iMESA_remap_index },
+   { 21902, WindowPos2ivMESA_remap_index },
+   { 22473, WindowPos2sMESA_remap_index },
+   {  6500, WindowPos2svMESA_remap_index },
+   {  8638, WindowPos3dMESA_remap_index },
+   { 15170, WindowPos3dvMESA_remap_index },
+   {   564, WindowPos3fMESA_remap_index },
+   { 16141, WindowPos3fvMESA_remap_index },
+   { 25752, WindowPos3iMESA_remap_index },
+   { 32287, WindowPos3ivMESA_remap_index },
+   { 20291, WindowPos3sMESA_remap_index },
+   { 33802, WindowPos3svMESA_remap_index },
+   { 12120, WindowPos4dMESA_remap_index },
+   { 18329, WindowPos4dvMESA_remap_index },
+   { 15129, WindowPos4fMESA_remap_index },
+   { 32823, WindowPos4fvMESA_remap_index },
+   { 32440, WindowPos4iMESA_remap_index },
+   { 13464, WindowPos4ivMESA_remap_index },
+   { 20468, WindowPos4sMESA_remap_index },
+   {  3540, WindowPos4svMESA_remap_index },
+   { 14878, MultiModeDrawArraysIBM_remap_index },
+   { 30970, MultiModeDrawElementsIBM_remap_index },
+   { 13239, DeleteFencesNV_remap_index },
+   { 29995, FinishFenceNV_remap_index },
+   {  4078, GenFencesNV_remap_index },
+   { 18309, GetFenceivNV_remap_index },
+   {  9115, IsFenceNV_remap_index },
+   { 35002, SetFenceNV_remap_index },
+   {  4590, TestFenceNV_remap_index },
+   { 33773, AreProgramsResidentNV_remap_index },
+   { 33128, BindProgramNV_remap_index },
+   { 27796, DeleteProgramsNV_remap_index },
+   { 22953, ExecuteProgramNV_remap_index },
+   { 35395, GenProgramsNV_remap_index },
+   { 25043, GetProgramParameterdvNV_remap_index },
+   { 11607, GetProgramParameterfvNV_remap_index },
+   { 28200, GetProgramStringNV_remap_index },
+   { 26129, GetProgramivNV_remap_index },
+   { 25306, GetTrackMatrixivNV_remap_index },
+   { 27985, GetVertexAttribPointervNV_remap_index },
+   { 11191, GetVertexAttribdvNV_remap_index },
+   { 20264, GetVertexAttribfvNV_remap_index },
+   { 19796, GetVertexAttribivNV_remap_index },
+   { 20751, IsProgramNV_remap_index },
+   { 10297, LoadProgramNV_remap_index },
+   { 29824, ProgramParameters4dvNV_remap_index },
+   { 26059, ProgramParameters4fvNV_remap_index },
+   { 22206, RequestResidentProgramsNV_remap_index },
+   { 32632, TrackMatrixNV_remap_index },
+   { 27489, VertexAttrib1dNV_remap_index },
+   { 14668, VertexAttrib1dvNV_remap_index },
+   { 30423, VertexAttrib1fNV_remap_index },
+   {  2732, VertexAttrib1fvNV_remap_index },
+   { 32880, VertexAttrib1sNV_remap_index },
+   { 16214, VertexAttrib1svNV_remap_index },
+   {  5411, VertexAttrib2dNV_remap_index },
+   { 19730, VertexAttrib2dvNV_remap_index },
+   { 21661, VertexAttrib2fNV_remap_index },
+   { 14134, VertexAttrib2fvNV_remap_index },
+   {  6712, VertexAttrib2sNV_remap_index },
+   { 20345, VertexAttrib2svNV_remap_index },
+   { 12317, VertexAttrib3dNV_remap_index },
+   { 34023, VertexAttrib3dvNV_remap_index },
+   { 11393, VertexAttrib3fNV_remap_index },
+   { 26501, VertexAttrib3fvNV_remap_index },
+   { 30398, VertexAttrib3sNV_remap_index },
+   { 25333, VertexAttrib3svNV_remap_index },
+   { 30944, VertexAttrib4dNV_remap_index },
+   { 35432, VertexAttrib4dvNV_remap_index },
+   {  5826, VertexAttrib4fNV_remap_index },
+   { 26896, VertexAttrib4fvNV_remap_index },
+   { 28696, VertexAttrib4sNV_remap_index },
+   {  1537, VertexAttrib4svNV_remap_index },
+   {  5586, VertexAttrib4ubNV_remap_index },
+   {   826, VertexAttrib4ubvNV_remap_index },
+   { 23154, VertexAttribPointerNV_remap_index },
+   {  2564, VertexAttribs1dvNV_remap_index },
+   { 20413, VertexAttribs1fvNV_remap_index },
+   { 35232, VertexAttribs1svNV_remap_index },
+   { 11444, VertexAttribs2dvNV_remap_index },
+   { 31937, VertexAttribs2fvNV_remap_index },
+   { 18921, VertexAttribs2svNV_remap_index },
+   {  6006, VertexAttribs3dvNV_remap_index },
+   {  2423, VertexAttribs3fvNV_remap_index },
+   { 32009, VertexAttribs3svNV_remap_index },
+   { 28786, VertexAttribs4dvNV_remap_index },
+   {  6078, VertexAttribs4fvNV_remap_index },
+   { 35019, VertexAttribs4svNV_remap_index },
+   { 31741, VertexAttribs4ubvNV_remap_index },
+   { 28856, GetTexBumpParameterfvATI_remap_index },
+   { 35273, GetTexBumpParameterivATI_remap_index },
+   { 19990, TexBumpParameterfvATI_remap_index },
+   { 22077, TexBumpParameterivATI_remap_index },
+   { 16778, AlphaFragmentOp1ATI_remap_index },
+   {  9130, AlphaFragmentOp2ATI_remap_index },
+   { 26417, AlphaFragmentOp3ATI_remap_index },
+   { 15102, BeginFragmentShaderATI_remap_index },
+   { 33327, BindFragmentShaderATI_remap_index },
+   { 25462, ColorFragmentOp1ATI_remap_index },
+   {  4786, ColorFragmentOp2ATI_remap_index },
+   { 33668, ColorFragmentOp3ATI_remap_index },
+   {  6244, DeleteFragmentShaderATI_remap_index },
+   { 35456, EndFragmentShaderATI_remap_index },
+   { 34570, GenFragmentShadersATI_remap_index },
+   { 27352, PassTexCoordATI_remap_index },
+   {  7819, SampleMapATI_remap_index },
+   { 29018, SetFragmentShaderConstantATI_remap_index },
+   {   411, PointParameteriNV_remap_index },
+   { 15356, PointParameterivNV_remap_index },
+   { 30783, ActiveStencilFaceEXT_remap_index },
+   { 29464, BindVertexArrayAPPLE_remap_index },
+   {  3054, DeleteVertexArraysAPPLE_remap_index },
+   { 19388, GenVertexArraysAPPLE_remap_index },
+   { 25108, IsVertexArrayAPPLE_remap_index },
+   {   867, GetProgramNamedParameterdvNV_remap_index },
+   {  3919, GetProgramNamedParameterfvNV_remap_index },
+   { 28887, ProgramNamedParameter4dNV_remap_index },
+   { 15695, ProgramNamedParameter4dvNV_remap_index },
+   {  9820, ProgramNamedParameter4fNV_remap_index },
+   { 12808, ProgramNamedParameter4fvNV_remap_index },
+   { 18240, PrimitiveRestartIndexNV_remap_index },
+   { 30597, PrimitiveRestartNV_remap_index },
+   { 26038, DepthBoundsEXT_remap_index },
+   {  1208, BlendEquationSeparateEXT_remap_index },
+   { 15915, BindFramebufferEXT_remap_index },
+   { 27572, BindRenderbufferEXT_remap_index },
+   { 10612, CheckFramebufferStatusEXT_remap_index },
+   { 24331, DeleteFramebuffersEXT_remap_index },
+   { 33925, DeleteRenderbuffersEXT_remap_index },
+   { 14585, FramebufferRenderbufferEXT_remap_index },
+   { 14783, FramebufferTexture1DEXT_remap_index },
+   { 12602, FramebufferTexture2DEXT_remap_index },
+   { 12222, FramebufferTexture3DEXT_remap_index },
+   { 24946, GenFramebuffersEXT_remap_index },
+   { 18786, GenRenderbuffersEXT_remap_index },
+   {  7555, GenerateMipmapEXT_remap_index },
+   { 23270, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 34476, GetRenderbufferParameterivEXT_remap_index },
+   { 21957, IsFramebufferEXT_remap_index },
+   { 35355, IsRenderbufferEXT_remap_index },
+   {  9062, RenderbufferStorageEXT_remap_index },
+   {   743, BlitFramebufferEXT_remap_index },
+   { 15481, BufferParameteriAPPLE_remap_index },
+   { 20783, FlushMappedBufferRangeAPPLE_remap_index },
+   {  2072, BindFragDataLocationEXT_remap_index },
+   { 10246, GetFragDataLocationEXT_remap_index },
+   { 11722, GetUniformuivEXT_remap_index },
+   { 34650, GetVertexAttribIivEXT_remap_index },
+   {  4607, GetVertexAttribIuivEXT_remap_index },
+   { 13072, Uniform1uiEXT_remap_index },
+   { 29909, Uniform1uivEXT_remap_index },
+   { 23812, Uniform2uiEXT_remap_index },
+   {  4750, Uniform2uivEXT_remap_index },
+   { 31223, Uniform3uiEXT_remap_index },
+   { 15842, Uniform3uivEXT_remap_index },
+   {  3843, Uniform4uiEXT_remap_index },
+   {  9596, Uniform4uivEXT_remap_index },
+   {  7336, VertexAttribI1iEXT_remap_index },
+   {  5613, VertexAttribI1ivEXT_remap_index },
+   {  2833, VertexAttribI1uiEXT_remap_index },
+   { 13862, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 25518, VertexAttribI2ivEXT_remap_index },
-   {  5998, VertexAttribI2uiEXT_remap_index },
-   {  5290, VertexAttribI2uivEXT_remap_index },
-   { 28330, VertexAttribI3iEXT_remap_index },
-   { 26745, VertexAttribI3ivEXT_remap_index },
-   {  3734, VertexAttribI3uiEXT_remap_index },
-   { 32415, VertexAttribI3uivEXT_remap_index },
-   { 23544, VertexAttribI4bvEXT_remap_index },
-   { 15640, VertexAttribI4iEXT_remap_index },
-   { 34067, VertexAttribI4ivEXT_remap_index },
-   { 14361, VertexAttribI4svEXT_remap_index },
-   {  4309, VertexAttribI4ubvEXT_remap_index },
-   { 17291, VertexAttribI4uiEXT_remap_index },
-   {  6144, VertexAttribI4uivEXT_remap_index },
-   { 12242, VertexAttribI4usvEXT_remap_index },
-   { 19827, VertexAttribIPointerEXT_remap_index },
-   {  3349, FramebufferTextureLayerEXT_remap_index },
-   { 17663, ColorMaskIndexedEXT_remap_index },
-   { 20279, DisableIndexedEXT_remap_index },
-   { 28375, EnableIndexedEXT_remap_index },
-   { 23203, GetBooleanIndexedvEXT_remap_index },
-   { 11853, GetIntegerIndexedvEXT_remap_index },
-   { 24387, IsEnabledIndexedEXT_remap_index },
-   { 24287, ClearColorIiEXT_remap_index },
-   {  3830, ClearColorIuiEXT_remap_index },
-   { 10715, GetTexParameterIivEXT_remap_index },
-   {  6645, GetTexParameterIuivEXT_remap_index },
-   {  3305, TexParameterIivEXT_remap_index },
-   { 28197, TexParameterIuivEXT_remap_index },
-   {  5158, BeginConditionalRenderNV_remap_index },
-   { 27156, EndConditionalRenderNV_remap_index },
-   { 10069, BeginTransformFeedbackEXT_remap_index },
-   { 20358, BindBufferBaseEXT_remap_index },
-   { 20173, BindBufferOffsetEXT_remap_index },
-   { 13154, BindBufferRangeEXT_remap_index },
-   { 15262, EndTransformFeedbackEXT_remap_index },
-   { 11716, GetTransformFeedbackVaryingEXT_remap_index },
-   { 22241, TransformFeedbackVaryingsEXT_remap_index },
-   { 31528, ProvokingVertexEXT_remap_index },
-   { 11664, GetTexParameterPointervAPPLE_remap_index },
-   {  5700, TextureRangeAPPLE_remap_index },
-   { 12531, GetObjectParameterivAPPLE_remap_index },
-   { 21363, ObjectPurgeableAPPLE_remap_index },
-   {  6420, ObjectUnpurgeableAPPLE_remap_index },
-   { 18445, ActiveProgramEXT_remap_index },
-   { 18416, CreateShaderProgramEXT_remap_index },
-   { 30427, UseShaderProgramEXT_remap_index },
-   { 17616, TextureBarrierNV_remap_index },
-   { 30721, StencilFuncSeparateATI_remap_index },
-   {  6333, ProgramEnvParameters4fvEXT_remap_index },
-   { 18310, ProgramLocalParameters4fvEXT_remap_index },
-   { 15115, GetQueryObjecti64vEXT_remap_index },
-   { 11266, GetQueryObjectui64vEXT_remap_index },
-   { 25475, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 13043, EGLImageTargetTexture2DOES_remap_index },
+   { 25574, VertexAttribI2ivEXT_remap_index },
+   {  6032, VertexAttribI2uiEXT_remap_index },
+   {  5265, VertexAttribI2uivEXT_remap_index },
+   { 28488, VertexAttribI3iEXT_remap_index },
+   { 26851, VertexAttribI3ivEXT_remap_index },
+   {  3697, VertexAttribI3uiEXT_remap_index },
+   { 32528, VertexAttribI3uivEXT_remap_index },
+   { 23546, VertexAttribI4bvEXT_remap_index },
+   { 15774, VertexAttribI4iEXT_remap_index },
+   {  1938, VertexAttribI4ivEXT_remap_index },
+   { 14495, VertexAttribI4svEXT_remap_index },
+   { 17825, VertexAttribI4ubvEXT_remap_index },
+   {   145, VertexAttribI4uiEXT_remap_index },
+   {  6178, VertexAttribI4uivEXT_remap_index },
+   { 12385, VertexAttribI4usvEXT_remap_index },
+   { 19934, VertexAttribIPointerEXT_remap_index },
+   {  3355, FramebufferTextureLayerEXT_remap_index },
+   { 10204, ColorMaskIndexedEXT_remap_index },
+   { 28073, DisableIndexedEXT_remap_index },
+   { 28533, EnableIndexedEXT_remap_index },
+   { 23225, GetBooleanIndexedvEXT_remap_index },
+   { 26151, GetIntegerIndexedvEXT_remap_index },
+   { 24407, IsEnabledIndexedEXT_remap_index },
+   { 24307, ClearColorIiEXT_remap_index },
+   {  3793, ClearColorIuiEXT_remap_index },
+   { 10888, GetTexParameterIivEXT_remap_index },
+   {  6660, GetTexParameterIuivEXT_remap_index },
+   {  3311, TexParameterIivEXT_remap_index },
+   { 28355, TexParameterIuivEXT_remap_index },
+   {  5133, BeginConditionalRenderNV_remap_index },
+   { 27302, EndConditionalRenderNV_remap_index },
+   { 26196, BeginTransformFeedbackEXT_remap_index },
+   {  6736, BindBufferBaseEXT_remap_index },
+   { 24989, BindBufferOffsetEXT_remap_index },
+   { 13289, BindBufferRangeEXT_remap_index },
+   { 28967, EndTransformFeedbackEXT_remap_index },
+   {  5852, GetTransformFeedbackVaryingEXT_remap_index },
+   { 24003, TransformFeedbackVaryingsEXT_remap_index },
+   { 31642, ProvokingVertexEXT_remap_index },
+   { 11868, GetTexParameterPointervAPPLE_remap_index },
+   {  5675, TextureRangeAPPLE_remap_index },
+   { 12674, GetObjectParameterivAPPLE_remap_index },
+   { 21384, ObjectPurgeableAPPLE_remap_index },
+   {  6454, ObjectUnpurgeableAPPLE_remap_index },
+   { 18608, ActiveProgramEXT_remap_index },
+   {  4659, CreateShaderProgramEXT_remap_index },
+   { 30545, UseShaderProgramEXT_remap_index },
+   { 23027, TextureBarrierNV_remap_index },
+   { 30809, StencilFuncSeparateATI_remap_index },
+   {  6367, ProgramEnvParameters4fvEXT_remap_index },
+   { 18477, ProgramLocalParameters4fvEXT_remap_index },
+   { 15284, GetQueryObjecti64vEXT_remap_index },
+   { 11470, GetQueryObjectui64vEXT_remap_index },
+   { 25531, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 13178, EGLImageTargetTexture2DOES_remap_index },
    {    -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 */
-   {  2918, _gloffset_BlendColor },
+   {  2972, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 12136, _gloffset_BlendEquation },
+   { 12279, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 18184, _gloffset_ColorSubTable },
-   { 33730, _gloffset_CopyColorSubTable },
+   { 18351, _gloffset_ColorSubTable },
+   { 33857, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   296, _gloffset_ConvolutionFilter1D },
-   {  2698, _gloffset_CopyConvolutionFilter1D },
-   {  4576, _gloffset_GetConvolutionParameteriv },
-   {  9282, _gloffset_ConvolutionFilter2D },
-   {  9484, _gloffset_ConvolutionParameteriv },
-   {  9944, _gloffset_ConvolutionParameterfv },
-   { 22084, _gloffset_GetSeparableFilter },
-   { 25750, _gloffset_SeparableFilter2D },
-   { 26638, _gloffset_ConvolutionParameteri },
-   { 26831, _gloffset_ConvolutionParameterf },
-   { 28564, _gloffset_GetConvolutionParameterfv },
-   { 29453, _gloffset_GetConvolutionFilter },
-   { 32111, _gloffset_CopyConvolutionFilter2D },
+   {   305, _gloffset_ConvolutionFilter1D },
+   {  2771, _gloffset_CopyConvolutionFilter1D },
+   {  4449, _gloffset_GetConvolutionParameteriv },
+   {  9444, _gloffset_ConvolutionFilter2D },
+   {  9646, _gloffset_ConvolutionParameteriv },
+   { 10106, _gloffset_ConvolutionParameterfv },
+   { 22105, _gloffset_GetSeparableFilter },
+   { 25806, _gloffset_SeparableFilter2D },
+   { 26744, _gloffset_ConvolutionParameteri },
+   { 26936, _gloffset_ConvolutionParameterf },
+   { 28722, _gloffset_GetConvolutionParameterfv },
+   { 29630, _gloffset_GetConvolutionFilter },
+   { 32224, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 16140, _gloffset_CopyTexSubImage3D },
-   { 17871, _gloffset_CopyTexImage2D },
-   { 26221, _gloffset_CopyTexImage1D },
-   { 29134, _gloffset_CopyTexSubImage2D },
-   { 31723, _gloffset_CopyTexSubImage1D },
+   { 16274, _gloffset_CopyTexSubImage3D },
+   { 18038, _gloffset_CopyTexImage2D },
+   { 26327, _gloffset_CopyTexImage1D },
+   { 29311, _gloffset_CopyTexSubImage2D },
+   { 31837, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   { 10298, _gloffset_DrawRangeElements },
+   { 10471, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   895, _gloffset_Histogram },
-   {  3916, _gloffset_ResetHistogram },
-   { 10861, _gloffset_GetMinmax },
-   { 16474, _gloffset_GetHistogramParameterfv },
-   { 26146, _gloffset_GetMinmaxParameteriv },
-   { 28454, _gloffset_ResetMinmax },
-   { 29350, _gloffset_GetHistogramParameteriv },
-   { 30632, _gloffset_GetHistogram },
-   { 33355, _gloffset_Minmax },
-   { 35043, _gloffset_GetMinmaxParameterfv },
+   {   904, _gloffset_Histogram },
+   {  3879, _gloffset_ResetHistogram },
+   { 11034, _gloffset_GetMinmax },
+   { 16608, _gloffset_GetHistogramParameterfv },
+   { 26252, _gloffset_GetMinmaxParameteriv },
+   { 28612, _gloffset_ResetMinmax },
+   { 29527, _gloffset_GetHistogramParameteriv },
+   { 30743, _gloffset_GetHistogram },
+   { 33443, _gloffset_Minmax },
+   { 35102, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  9144, _gloffset_ColorTable },
-   { 16320, _gloffset_GetColorTable },
-   { 24673, _gloffset_GetColorTableParameterfv },
-   { 26887, _gloffset_GetColorTableParameteriv },
+   {  9306, _gloffset_ColorTable },
+   { 16454, _gloffset_GetColorTable },
+   { 24693, _gloffset_GetColorTableParameterfv },
+   { 26992, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7855, _gloffset_TexSubImage1D },
-   { 11591, _gloffset_TexSubImage2D },
+   {  7965, _gloffset_TexSubImage1D },
+   { 11795, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1941, _gloffset_TexImage3D },
-   { 24442, _gloffset_TexSubImage3D },
+   {  2031, _gloffset_TexImage3D },
+   { 24462, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3684, _gloffset_PrioritizeTextures },
-   {  8304, _gloffset_AreTexturesResident },
-   { 14565, _gloffset_GenTextures },
-   { 16851, _gloffset_DeleteTextures },
-   { 21025, _gloffset_IsTexture },
-   { 31788, _gloffset_BindTexture },
+   {  3647, _gloffset_PrioritizeTextures },
+   {  8439, _gloffset_AreTexturesResident },
+   { 14692, _gloffset_GenTextures },
+   { 16985, _gloffset_DeleteTextures },
+   { 21064, _gloffset_IsTexture },
+   { 31902, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 25922, _gloffset_ArrayElement },
-   { 32943, _gloffset_GetPointerv },
-   { 34556, _gloffset_DrawArrays },
+   { 25978, _gloffset_ArrayElement },
+   { 33031, _gloffset_GetPointerv },
+   { 34597, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  8422, _gloffset_ColorTableParameteriv },
-   {  9144, _gloffset_ColorTable },
-   { 16320, _gloffset_GetColorTable },
-   { 16430, _gloffset_CopyColorTable },
-   { 20886, _gloffset_ColorTableParameterfv },
-   { 24673, _gloffset_GetColorTableParameterfv },
-   { 26887, _gloffset_GetColorTableParameteriv },
+   {  8557, _gloffset_ColorTableParameteriv },
+   {  9306, _gloffset_ColorTable },
+   { 16454, _gloffset_GetColorTable },
+   { 16564, _gloffset_CopyColorTable },
+   { 20925, _gloffset_ColorTableParameterfv },
+   { 24693, _gloffset_GetColorTableParameterfv },
+   { 26992, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   464, _gloffset_MultiTexCoord3sARB },
-   {   696, _gloffset_ActiveTextureARB },
-   {  4734, _gloffset_MultiTexCoord1fvARB },
-   {  6921, _gloffset_MultiTexCoord3dARB },
-   {  6966, _gloffset_MultiTexCoord2iARB },
-   {  7090, _gloffset_MultiTexCoord2svARB },
-   {  9100, _gloffset_MultiTexCoord2fARB },
-   { 11296, _gloffset_MultiTexCoord3fvARB },
-   { 11898, _gloffset_MultiTexCoord4sARB },
-   { 12579, _gloffset_MultiTexCoord2dvARB },
-   { 12986, _gloffset_MultiTexCoord1svARB },
-   { 13351, _gloffset_MultiTexCoord3svARB },
-   { 13412, _gloffset_MultiTexCoord4iARB },
-   { 14269, _gloffset_MultiTexCoord3iARB },
-   { 15144, _gloffset_MultiTexCoord1dARB },
-   { 15376, _gloffset_MultiTexCoord3dvARB },
-   { 16692, _gloffset_MultiTexCoord3ivARB },
-   { 16737, _gloffset_MultiTexCoord2sARB },
-   { 18241, _gloffset_MultiTexCoord4ivARB },
-   { 20526, _gloffset_ClientActiveTextureARB },
-   { 22931, _gloffset_MultiTexCoord2dARB },
-   { 23368, _gloffset_MultiTexCoord4dvARB },
-   { 23790, _gloffset_MultiTexCoord4fvARB },
-   { 24814, _gloffset_MultiTexCoord3fARB },
-   { 27481, _gloffset_MultiTexCoord4dARB },
-   { 27747, _gloffset_MultiTexCoord1sARB },
-   { 27951, _gloffset_MultiTexCoord1dvARB },
-   { 28978, _gloffset_MultiTexCoord1ivARB },
-   { 29071, _gloffset_MultiTexCoord2ivARB },
-   { 29410, _gloffset_MultiTexCoord1iARB },
-   { 30930, _gloffset_MultiTexCoord4svARB },
-   { 31570, _gloffset_MultiTexCoord1fARB },
-   { 31850, _gloffset_MultiTexCoord4fARB },
-   { 34390, _gloffset_MultiTexCoord2fvARB },
+   {   473, _gloffset_MultiTexCoord3sARB },
+   {   705, _gloffset_ActiveTextureARB },
+   {  4688, _gloffset_MultiTexCoord1fvARB },
+   {  6949, _gloffset_MultiTexCoord3dARB },
+   {  6994, _gloffset_MultiTexCoord2iARB },
+   {  7118, _gloffset_MultiTexCoord2svARB },
+   {  9262, _gloffset_MultiTexCoord2fARB },
+   { 11500, _gloffset_MultiTexCoord3fvARB },
+   { 12041, _gloffset_MultiTexCoord4sARB },
+   { 12722, _gloffset_MultiTexCoord2dvARB },
+   { 13121, _gloffset_MultiTexCoord1svARB },
+   { 13486, _gloffset_MultiTexCoord3svARB },
+   { 13547, _gloffset_MultiTexCoord4iARB },
+   { 14403, _gloffset_MultiTexCoord3iARB },
+   { 15313, _gloffset_MultiTexCoord1dARB },
+   { 15510, _gloffset_MultiTexCoord3dvARB },
+   { 16826, _gloffset_MultiTexCoord3ivARB },
+   { 16871, _gloffset_MultiTexCoord2sARB },
+   { 18408, _gloffset_MultiTexCoord4ivARB },
+   { 20565, _gloffset_ClientActiveTextureARB },
+   { 22909, _gloffset_MultiTexCoord2dARB },
+   { 23390, _gloffset_MultiTexCoord4dvARB },
+   { 23767, _gloffset_MultiTexCoord4fvARB },
+   { 24834, _gloffset_MultiTexCoord3fARB },
+   { 27617, _gloffset_MultiTexCoord4dARB },
+   { 27895, _gloffset_MultiTexCoord1sARB },
+   { 28108, _gloffset_MultiTexCoord1dvARB },
+   { 29155, _gloffset_MultiTexCoord1ivARB },
+   { 29248, _gloffset_MultiTexCoord2ivARB },
+   { 29587, _gloffset_MultiTexCoord1iARB },
+   { 31018, _gloffset_MultiTexCoord4svARB },
+   { 31684, _gloffset_MultiTexCoord1fARB },
+   { 31963, _gloffset_MultiTexCoord4fARB },
+   { 34431, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 09e3d74ea..5804353fb 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -905,7 +905,7 @@ OsVendorInit(void)
  * two routines mentioned here, as well as by others) to use the
  * referenced routine instead of \a vfprintf().) */
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
 }
 
diff --git a/xorg-server/hw/dmx/dmxlog.c b/xorg-server/hw/dmx/dmxlog.c
index b56bb93ed..33aee590a 100644
--- a/xorg-server/hw/dmx/dmxlog.c
+++ b/xorg-server/hw/dmx/dmxlog.c
@@ -110,9 +110,6 @@ VFatalError(const char *format, va_list args)
 {
     VErrorF(format, args);
     ErrorF("\n");
-#ifdef DDXOSFATALERROR
-    OsVendorFatalError();
-#endif
     AbortServer();
  /*NOTREACHED*/}
 #endif
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index f65ab96bc..ecdae1921 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -1104,7 +1104,7 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 }
 
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
 }
 
diff --git a/xorg-server/hw/vfb/InitOutput.c b/xorg-server/hw/vfb/InitOutput.c
index 2d679a559..e2cd96cdc 100644
--- a/xorg-server/hw/vfb/InitOutput.c
+++ b/xorg-server/hw/vfb/InitOutput.c
@@ -219,7 +219,7 @@ OsVendorInit(void)
 }
 
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 0974893d3..2a7d0a37e 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -1053,7 +1053,7 @@ AbortDDX(enum ExitCode error)
 }
 
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
 #ifdef VENDORSUPPORT
     ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
diff --git a/xorg-server/hw/xfree86/exa/man/exa.man b/xorg-server/hw/xfree86/exa/man/exa.man
index 30d01824d..42a8de31d 100644
--- a/xorg-server/hw/xfree86/exa/man/exa.man
+++ b/xorg-server/hw/xfree86/exa/man/exa.man
@@ -14,7 +14,7 @@ The
 .B EXA
 architecture is designed to make accelerating the Render extension simple and
 efficient, and results in various performance tradeoffs compared to XAA.  Some
-__xconfigfile__ options are available for debugging performance issues or
+xorg.conf options are available for debugging performance issues or
 driver rendering problems.  They are not intended for general use.
 .TP
 .BI "Option \*qEXANoComposite\*q \*q" boolean \*q
@@ -36,7 +36,7 @@ default is intended to be the best performing one for general use, though others
 may help with specific use cases.  Available options include \*qalways\*q,
 \*qgreedy\*q, and \*qsmart\*q.  Default: always.
 .SH "SEE ALSO"
-.BR __xservername__ (__appmansuffix__),
-.BR __xconfigfile__(__filemansuffix__).
+.BR Xorg (__appmansuffix__),
+.BR xorg.conf(__filemansuffix__).
 .SH AUTHORS
 Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel D\(:anzer
diff --git a/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
index fe5d1e17b..fa46df08f 100644
--- a/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
+++ b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man
@@ -14,7 +14,7 @@ fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
+Xorg(__appmansuffix__), xorg.conf(__filemansuffix__),
 xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 fbdev(__drivermansuffix__)
 .SH AUTHORS
diff --git a/xorg-server/hw/xfree86/man/Xorg.man b/xorg-server/hw/xfree86/man/Xorg.man
index 2fa72d672..0cd5a1068 100644
--- a/xorg-server/hw/xfree86/man/Xorg.man
+++ b/xorg-server/hw/xfree86/man/Xorg.man
@@ -1,16 +1,16 @@
 .\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH __xservername__ __appmansuffix__ __vendorversion__
+.TH Xorg __appmansuffix__ __vendorversion__
 .SH NAME
-__xservername__ - X11R7 X server
+Xorg - X11R7 X server
 .SH SYNOPSIS
-.B __xservername__
+.B Xorg
 .RI [\fB:\fP display ]
 .RI [ option
 .IR ... ]
 .SH DESCRIPTION
-.B __xservername__
+.B Xorg
 is a full featured X server that was originally designed for UNIX and
 UNIX-like operating systems running on Intel x86 hardware.  It now runs
 on a wider range of hardware and OS platforms.
@@ -24,7 +24,7 @@ by Thomas Roell which was contributed to X11R5 by Snitily Graphics
 Consulting Service.
 .SH PLATFORMS
 .PP
-.B __xservername__
+.B Xorg
 operates under a wide range of operating systems and hardware platforms.
 The Intel x86 (IA32) architecture is the most widely supported hardware
 platform.  Other hardware platforms include Compaq Alpha, Intel IA64, AMD64,
@@ -37,7 +37,7 @@ Xquartz(__appmansuffix__) X server.  Win32/Cygwin is supported with the
 XWin(__appmansuffix__) X server.
 .PP
 .SH "NETWORK CONNECTIONS"
-.B __xservername__
+.B Xorg
 supports connections made using the following reliable
 byte-streams:
 .TP 4
@@ -47,7 +47,7 @@ On some System V platforms, the "local" connection types also include
 STREAMS pipes, named pipes, and some other mechanisms.
 .TP 4
 .I TCP\/IP
-.B __xservername__
+.B Xorg
 listens on port
 .RI 6000+ n ,
 where
@@ -108,10 +108,10 @@ file.  If you use xdm(1), the definitions should be early on in the
 .I __projectroot__/lib/X11/xdm/Xsession
 script.
 .SH OPTIONS
-.B __xservername__
+.B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-__xconfigfile__(__filemansuffix__) configuration files, auto-detection, and
+xorg.conf(__filemansuffix__) configuration files, auto-detection, and
 fallback defaults.  When the same information is supplied in more than
 one way, the highest precedence mechanism is used.  The list of mechanisms
 is ordered from highest precedence to lowest.  Note that not all parameters
@@ -119,21 +119,21 @@ can be supplied via all methods.  The available command line options
 and environment variables (and some defaults) are described here and in
 the Xserver(__appmansuffix__) manual page.  Most configuration file
 parameters, with their defaults, are described in the
-__xconfigfile__(__filemansuffix__) manual page.  Driver and module specific
+xorg.conf(__filemansuffix__) manual page.  Driver and module specific
 configuration parameters are described in the relevant driver or module
 manual page.
 .PP
 In addition to the normal server options described in the
 Xserver(__appmansuffix__) manual page,
-.B __xservername__
+.B Xorg
 accepts the following command line switches:
 .TP 8
 .BI vt XX
 .I XX
 specifies the Virtual Terminal device number which
-.B __xservername__
+.B Xorg
 will use.  Without this option,
-.B __xservername__
+.B Xorg
 will pick the first available Virtual Terminal that it can locate.  This
 option applies only to platforms that have virtual terminal support, such
 as Linux, BSD, OpenSolaris, SVR3, and SVR4.
@@ -142,14 +142,14 @@ as Linux, BSD, OpenSolaris, SVR3, and SVR4.
 Allow the server to start up even if the mouse device can't be opened
 or initialised.  This is equivalent to the
 .B AllowMouseOpenFail
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B \-allowNonLocalXvidtune
 Make the VidMode extension available to remote clients.  This allows
 the xvidtune client to connect from another host.  This is equivalent
 to the
 .B AllowNonLocalXvidtune
-__xconfigfile__(__filemansuffix__) file option.  By default non-local
+xorg.conf(__filemansuffix__) file option.  By default non-local
 connections are not allowed.
 .TP 8
 .BI \-bgamma " value"
@@ -187,9 +187,9 @@ config directory search path for all other users.
 .TP 8
 .B \-configure
 When this option is specified, the
-.B __xservername__
+.B Xorg
 server loads all video driver modules, probes for available hardware,
-and writes out an initial __xconfigfile__(__filemansuffix__) file based on
+and writes out an initial xorg.conf(__filemansuffix__) file based on
 what was detected.  This option currently has some problems on some
 platforms, but in most cases it is a good way to bootstrap the
 configuration process.  This option is only available when the server
@@ -209,7 +209,7 @@ Disable the parts of the VidMode extension (used by the xvidtune
 client) that can be used to change the video modes.  This is equivalent
 to the
 .B DisableVidModeExtension
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B \-fbbpp \fIn\fP
 Sets the number of framebuffer bits per pixel.  You should only set this
@@ -249,7 +249,7 @@ options.
 .TP 8
 .B \-ignoreABI
 The
-.B __xservername__
+.B Xorg
 server checks the ABI revision levels of each module that it loads.  It
 will normally refuse to load modules with ABI revisions that are newer
 than the server's.  This is because such modules might use interfaces
@@ -276,7 +276,7 @@ This option is only useful when debugging the server.  Not all platforms
 support (or can use) this option.
 .TP 8
 .BI \-keyboard " keyboard-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B InputDevice
 section called
 .I keyboard-name
@@ -288,7 +288,7 @@ section and this option, the first relevant
 section is used for the core keyboard.
 .TP 8
 .BI \-layout " layout-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B Layout
 section called
 .IR layout-name .
@@ -300,20 +300,20 @@ section is used.
 Use the file called
 .I filename
 as the
-.B __xservername__
+.B Xorg
 server log file.  The default log file is
-.BI __logdir__/__xservername__. n .log
+.BI __logdir__/Xorg. n .log
 on most platforms, where
 .I n
 is the display number of the
-.B __xservername__
+.B Xorg
 server.  The default may be in a different directory on some platforms.
 This option is only available when the server is run as root (i.e, with
 real-uid 0).
 .TP 8
 .BR \-logverbose " [\fIn\fP]"
 Sets the verbosity level for information printed to the
-.B __xservername__
+.B Xorg
 server log file.  If the
 .I n
 value isn't supplied, each occurrence of this option increments the log
@@ -327,7 +327,7 @@ Set the module search path to
 .IR searchpath .
 .I searchpath
 is a comma separated list of directories to search for
-.B __xservername__
+.B Xorg
 server modules.  This option is only available when the server is run
 as root (i.e, with real-uid 0).
 .TP 8
@@ -345,16 +345,16 @@ reason to use this option.  Some client applications don't like this
 pixmap format, even though it is a perfectly legal format.  This is
 equivalent to the
 .B Pixmap
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B \-pixmap32
 Set the internal pixmap format for depth 24 pixmaps to 32 bits per pixel.
 This is usually the default.  This is equivalent to the
 .B Pixmap
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .BI \-pointer " pointer-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B InputDevice
 section called
 .I pointer-name
@@ -384,7 +384,7 @@ options.
 Share virtual terminals with another X server, if supported by the OS.
 .TP 8
 .BI \-screen " screen-name"
-Use the __xconfigfile__(__filemansuffix__) file
+Use the xorg.conf(__filemansuffix__) file
 .B Screen
 section called
 .IR screen-name .
@@ -434,7 +434,7 @@ support.
 .SH "KEYBOARD"
 .PP
 The
-.B __xservername__
+.B Xorg
 server is normally configured to recognize various special combinations
 of key presses that instruct the server to perform some action, rather
 than just sending the key press event to a client application. These actions
@@ -448,7 +448,7 @@ keymap.
 Immediately kills the server -- no questions asked. It can be disabled by
 setting the
 .B DontZap
-__xconfigfile__(__filemansuffix__) file option to a TRUE value.
+xorg.conf(__filemansuffix__) file option to a TRUE value.
 .PP
 .RS 8
 It should be noted that zapping is triggered by the
@@ -462,43 +462,43 @@ but can be enabled with the XKB option
 Change video mode to next one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B Ctrl+Alt+Keypad-Minus
 Change video mode to previous one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .TP 8
 .B Ctrl+Alt+F1...F12
 For systems with virtual terminal support, these keystroke
 combinations are used to switch to virtual terminals 1 through 12,
 respectively.  This can be disabled with the
 .B DontVTSwitch
-__xconfigfile__(__filemansuffix__) file option.
+xorg.conf(__filemansuffix__) file option.
 .SH CONFIGURATION
-.B __xservername__
+.B Xorg
 typically uses a configuration file called
-.B __xconfigfile__
+.B xorg.conf
 and configuration files with the suffix
 .I .conf
 in a directory called
 .B __xconfigdir__
 for its initial setup.
-Refer to the __xconfigfile__(__filemansuffix__) manual page for information
+Refer to the xorg.conf(__filemansuffix__) manual page for information
 about the format of this file.
 .PP
-.B __xservername__
+.B Xorg
 has a mechanism for automatically generating a built-in configuration
 at run-time when no
-.B __xconfigfile__
+.B xorg.conf
 file or
 .B __xconfigdir__
 files are present.  The current version of this automatic configuration
 mechanism works in two ways.
 .PP
 The first is via enhancements that have made many components of the
-.B __xconfigfile__
+.B xorg.conf
 file optional.  This means that information that can be probed or
 reasonably deduced doesn't need to be specified explicitly, greatly
 reducing the amount of built-in configuration information that needs to
@@ -506,33 +506,33 @@ be generated at run-time.
 .PP
 The second is to have "safe" fallbacks for most configuration information.
 This maximises the likelihood that the
-.B __xservername__
+.B Xorg
 server will start up in some usable configuration even when information
 about the specific hardware is not available.
 .PP
-The automatic configuration support for __xservername__ is work in progress.
+The automatic configuration support for Xorg is work in progress.
 It is currently aimed at the most popular hardware and software platforms
-supported by __xservername__.  Enhancements are planned for future releases.
+supported by Xorg.  Enhancements are planned for future releases.
 .SH FILES
 The
-.B __xservername__
+.B Xorg
 server config files can be found in a range of locations.  These are
-documented fully in the __xconfigfile__(__filemansuffix__) manual page.  The
+documented fully in the xorg.conf(__filemansuffix__) manual page.  The
 most commonly used locations are shown here.
 .TP 30
-.B /etc/X11/__xconfigfile__
+.B /etc/X11/xorg.conf
 Server configuration file.
 .TP 30
-.B /etc/X11/__xconfigfile__-4
+.B /etc/X11/xorg.conf-4
 Server configuration file.
 .TP 30
-.B /etc/__xconfigfile__
+.B /etc/xorg.conf
 Server configuration file.
 .TP 30
-.B __projectroot__/etc/__xconfigfile__
+.B __projectroot__/etc/xorg.conf
 Server configuration file.
 .TP 30
-.B __projectroot__/lib/X11/__xconfigfile__
+.B __projectroot__/lib/X11/xorg.conf
 Server configuration file.
 .TP 30
 .B /etc/X11/__xconfigdir__
@@ -550,7 +550,7 @@ Server configuration directory.
 .B __projectroot__/lib/X11/__xconfigdir__
 Server configuration directory.
 .TP 30
-.BI __logdir__/__xservername__. n .log
+.BI __logdir__/Xorg. n .log
 Server log file for display
 .IR n .
 .TP 30
@@ -580,7 +580,7 @@ Initial access control list for display
 .IR n .
 .SH "SEE ALSO"
 X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
-__xconfigfile__(__filemansuffix__), xvidtune(__appmansuffix__),
+xorg.conf(__filemansuffix__), xvidtune(__appmansuffix__),
 xkeyboard-config (__miscmansuffix__),
 apm(__drivermansuffix__),
 ati(__drivermansuffix__),
@@ -623,15 +623,15 @@ Web site
 .IR <http://www.x.org> .
 
 .SH AUTHORS
-__xservername__ has many contributors world wide.  The names of most of them
+Xorg has many contributors world wide.  The names of most of them
 can be found in the documentation, ChangeLog files in the source tree,
 and in the actual source code.
 .PP
-__xservername__ was originally based on XFree86 4.4rc2.
+Xorg was originally based on XFree86 4.4rc2.
 That was originally based on \fIX386 1.2\fP by Thomas Roell, which
 was contributed to the then X Consortium's X11R5 distribution by SGCS.
 .PP
-__xservername__ is released by the X.Org Foundation.
+Xorg is released by the X.Org Foundation.
 .PP
 The project that became XFree86 was originally founded in 1992 by
 David Dawes, Glenn Lai, Jim Tsillas and David Wexelblat.
@@ -671,7 +671,7 @@ Orest Zborowski    \fIorestz@eskimo.com\fP
 .fi
 .RE
 .PP
-__xservername__ source is available from the FTP server
+Xorg source is available from the FTP server
 \fI<ftp://ftp.x.org/>\fP, and from the X.Org
 server \fI<http://gitweb.freedesktop.org/>\fP.  Documentation and other
 information can be found from the X.Org web site
@@ -679,10 +679,10 @@ information can be found from the X.Org web site
 
 .SH LEGAL
 .PP
-.B __xservername__
+.B Xorg
 is copyright software, provided under licenses that permit modification
 and redistribution in source and binary form without fee.
-.B __xservername__ is copyright by numerous authors and
+.B Xorg is copyright by numerous authors and
 contributors from around the world.  Licensing information can be found
 at
 .IR <http://www.x.org> .
diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man
index c1b3c4f2d..72e57136c 100644
--- a/xorg-server/hw/xfree86/man/xorg.conf.man
+++ b/xorg-server/hw/xfree86/man/xorg.conf.man
@@ -1,35 +1,35 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH __xconfigfile__ __filemansuffix__ __vendorversion__
+.TH xorg.conf __filemansuffix__ __vendorversion__
 .SH NAME
-__xconfigfile__, __xconfigdir__ \- configuration files for
-__xservername__ X server
+xorg.conf, __xconfigdir__ \- configuration files for
+Xorg X server
 .SH INTRODUCTION
-.B __xservername__
+.B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-__xconfigfile__ and __xconfigdir__ configuration files, auto-detection,
+xorg.conf and __xconfigdir__ configuration files, auto-detection,
 and fallback defaults. When the same information is supplied in more
 than one way, the highest precedence mechanism is used. The list of
 mechanisms is ordered from highest precedence to lowest. Note that not
 all parameters can be supplied via all methods. The available command
 line options and environment variables (and some defaults) are
 described in the Xserver(__appmansuffix__) and
-__xservername__(__appmansuffix__) manual pages. Most configuration file
+Xorg(__appmansuffix__) manual pages. Most configuration file
 parameters, with their defaults, are described below. Driver and module
 specific configuration parameters are described in the relevant driver
 or module manual page.
 .SH DESCRIPTION
-.B __xservername__
+.B Xorg
 uses a configuration file called
-.I __xconfigfile__
+.I xorg.conf
 and files ending in the suffix
 .I .conf
 from the directory
 .I __xconfigdir__
 for its initial setup.
 The
-.I __xconfigfile__
+.I xorg.conf
 configuration file is searched for in the following places when the
 server is started as a normal user:
 .PP
@@ -39,12 +39,12 @@ server is started as a normal user:
 .IR __projectroot__/etc/X11/ <cmdline>
 .IB /etc/X11/ $XORGCONFIG
 .IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__
-.I /etc/__xconfigfile__
-.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__
-.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__
+.I /etc/X11/xorg.conf
+.I /etc/xorg.conf
+.IR __projectroot__/etc/X11/xorg.conf. <hostname>
+.I __projectroot__/etc/X11/xorg.conf
+.IR __projectroot__/lib/X11/xorg.conf. <hostname>
+.I __projectroot__/lib/X11/xorg.conf
 .fi
 .RE
 .PP
@@ -60,7 +60,7 @@ environment variable, and
 is the machine's hostname as reported by
 .BR gethostname (__libmansuffix__).
 .PP
-When the __xservername__ server is started by the \(lqroot\(rq user, the config file
+When the Xorg server is started by the \(lqroot\(rq user, the config file
 search locations are as follows:
 .PP
 .RS 4
@@ -71,12 +71,12 @@ search locations are as follows:
 .B $XORGCONFIG
 .IB /etc/X11/ $XORGCONFIG
 .IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__
-.I /etc/__xconfigfile__
-.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__
-.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__
+.I /etc/X11/xorg.conf
+.I /etc/xorg.conf
+.IR __projectroot__/etc/X11/xorg.conf. <hostname>
+.I __projectroot__/etc/X11/xorg.conf
+.IR __projectroot__/lib/X11/xorg.conf. <hostname>
+.I __projectroot__/lib/X11/xorg.conf
 .fi
 .RE
 .PP
@@ -113,7 +113,7 @@ is a relative path (with no \(lq..\(rq components) specified with the
 .B \-configdir
 command line option.
 .PP
-When the __xservername__ server is started by the \(lqroot\(rq user, the
+When the Xorg server is started by the \(lqroot\(rq user, the
 config directory search locations are as follows:
 .PP
 .RS 4
@@ -145,7 +145,7 @@ These files are found in the following directories:
 .RE
 .PP
 The
-.I __xconfigfile__
+.I xorg.conf
 and
 .I __xconfigdir__
 files are composed of a number of sections which may be present in any order,
@@ -331,7 +331,7 @@ section is used to specify some path names required by the server.
 Some of these paths can also be set from the command line (see
 .BR Xserver (__appmansuffix__)
 and
-.BR __xservername__ (__appmansuffix__)).
+.BR Xorg (__appmansuffix__)).
 The command line settings override the values specified in the config
 file.
 The
@@ -342,7 +342,7 @@ The entries that can appear in this section are:
 .TP 7
 .BI "FontPath \*q" path \*q
 sets the search path for fonts.
-This path is a comma separated list of font path elements which the __xservername__
+This path is a comma separated list of font path elements which the Xorg
 server searches for font databases.
 Multiple
 .B FontPath
@@ -426,8 +426,8 @@ font path when the server starts up.
 .RE
 .TP 7
 .BI "ModulePath \*q" path \*q
-sets the search path for loadable __xservername__ server modules.
-This path is a comma separated list of directories which the __xservername__ server
+sets the search path for loadable Xorg server modules.
+This path is a comma separated list of directories which the Xorg server
 searches for loadable modules loading in the order specified.
 Multiple
 .B ModulePath
@@ -441,17 +441,17 @@ __modulepath__
 .ig
 .TP 7
 .BI "LogFile \*q" path \*q
-sets the name of the __xservername__ server log file.
+sets the name of the Xorg server log file.
 The default log file name is
 .PP
 .RS 11
-.RI __logdir__/__xservername__. <n> .log
+.RI __logdir__/Xorg. <n> .log
 .RE
 .PP
 .RS 7
 where
 .I <n>
-is the display number for the __xservername__ server.
+is the display number for the Xorg server.
 ..
 .TP 7
 .BI "XkbDir \*q" path \*q
@@ -466,7 +466,7 @@ __xkbdir__
 In addition to options specific to this section (described below), the
 .B ServerFlags
 section is used to specify some global
-__xservername__ server options.
+Xorg server options.
 All of the entries in this section are
 .BR Options ,
 although for compatibility purposes some of the old style entries are
@@ -498,20 +498,20 @@ section to use in the absence of the
 command line option.
 .TP 7
 .BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
-This prevents the __xservername__ server from trapping a range of unexpected fatal
+This prevents the Xorg server from trapping a range of unexpected fatal
 signals and exiting cleanly.
-Instead, the __xservername__ server will die and drop core where the fault occurred.
-The default behaviour is for the __xservername__ server to exit cleanly, but still drop a
+Instead, the Xorg server will die and drop core where the fault occurred.
+The default behaviour is for the Xorg server to exit cleanly, but still drop a
 core file.
-In general you never want to use this option unless you are debugging an __xservername__
+In general you never want to use this option unless you are debugging an Xorg
 server problem and know how to deal with the consequences.
 .TP 7
 .BI "Option \*qUseSIGIO\*q  \*q" boolean \*q
-This controls whether the __xservername__ server requests that events from
+This controls whether the Xorg server requests that events from
 input devices be reported via a SIGIO signal handler (also known as SIGPOLL
 on some platforms), or only reported via the standard select(3) loop.
 The default behaviour is platform specific.   In general you do not want to
-use this option unless you are debugging the __xservername__ server, or
+use this option unless you are debugging the Xorg server, or
 working around a specific bug until it is fixed, and understand the
 consequences.
 .TP 7
@@ -531,7 +531,7 @@ Default: off.
 This disallows the use of the
 .B Terminate_Server
 XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
-This action is normally used to terminate the __xservername__ server.
+This action is normally used to terminate the Xorg server.
 When this option is enabled, the action has no effect.
 Default: off.
 .TP 7
@@ -568,7 +568,7 @@ sets the inactivity timeout for the
 phase of the screensaver.
 .I time
 is in minutes.
-This is equivalent to the __xservername__ server's
+This is equivalent to the Xorg server's
 .B \-s
 flag, and the value can be changed at run\-time with
 .BR xset(__appmansuffix__).
@@ -679,9 +679,9 @@ Unset by default.
 .SH "MODULE SECTION"
 The
 .B Module
-section is used to specify which __xservername__ server modules should be loaded.
-This section is ignored when the __xservername__ server is built in static form.
-The type of modules normally loaded in this section are __xservername__ server
+section is used to specify which Xorg server modules should be loaded.
+This section is ignored when the Xorg server is built in static form.
+The type of modules normally loaded in this section are Xorg server
 extension modules.
 Most other module types are loaded automatically when they are needed via
 other mechanisms.
@@ -1324,14 +1324,14 @@ recommends that you do.
 .BI "ClockChip  \*q" clockchip\-type \*q
 This optional entry is used to specify the clock chip type on graphics
 boards which have a programmable clock generator.
-Only a few __xservername__ drivers support programmable clock chips.
+Only a few Xorg drivers support programmable clock chips.
 For details, see the appropriate driver manual page.
 .TP 7
 .BI "VideoRam  " "mem"
 This optional entry specifies the amount of video ram that is installed
 on the graphics board.
 This is measured in kBytes.
-In most cases this is not required because the __xservername__ server probes
+In most cases this is not required because the Xorg server probes
 the graphics board to determine this quantity.
 The driver-specific documentation should indicate when it might be needed.
 .TP 7
@@ -1481,7 +1481,7 @@ if
 or
 .B Hz
 is added to the end of the line.
-The data given here is used by the __xservername__ server to determine if video
+The data given here is used by the Xorg server to determine if video
 modes are within the specifications of the monitor.
 This information should be available in the monitor's handbook.
 If this entry is omitted, a default range of 28\-33kHz is used.
@@ -1500,7 +1500,7 @@ if
 or
 .B kHz
 is added to the end of the line.
-The data given here is used by the __xservername__ server to determine if video
+The data given here is used by the Xorg server to determine if video
 modes are within the specifications of the monitor.
 This information should be available in the monitor's handbook.
 If this entry is omitted, a default range of 43\-72Hz is used.
@@ -1895,7 +1895,7 @@ Others are driver\-independent, and will eventually be described here.
 .TP 7
 .BI "Option \*qAccel\*q"
 Enables XAA (X Acceleration Architecture), a mechanism that makes video cards'
-2D hardware acceleration available to the  __xservername__ server.
+2D hardware acceleration available to the  Xorg server.
 This option is on by default, but it may be necessary to turn it off if
 there are bugs in the driver.
 There are many options to disable specific accelerated operations, listed
@@ -2070,7 +2070,7 @@ formats.
 This may also be specified from the command line with the
 .B \-weight
 option (see
-.BR __xservername__(__appmansuffix__)).
+.BR Xorg(__appmansuffix__)).
 .TP 7
 .BI "Virtual  " "xdim ydim"
 This optional entry specifies the virtual screen resolution to be used.
@@ -2414,7 +2414,7 @@ The data therein is not used in this release.
 General:
 .BR X (__miscmansuffix__),
 .BR Xserver (__appmansuffix__),
-.BR __xservername__ (__appmansuffix__),
+.BR Xorg (__appmansuffix__),
 .BR cvt (__appmansuffix__),
 .BR gtf (__appmansuffix__).
 .PP
diff --git a/xorg-server/hw/xfree86/utils/man/cvt.man b/xorg-server/hw/xfree86/utils/man/cvt.man
index f5075f5bf..310e46405 100644
--- a/xorg-server/hw/xfree86/utils/man/cvt.man
+++ b/xorg-server/hw/xfree86/utils/man/cvt.man
@@ -12,8 +12,8 @@ cvt - calculate VESA CVT mode lines
 .I Cvt
 is a utility for calculating VESA Coordinated Video Timing modes.  Given the
 desired horizontal and vertical resolutions, a modeline adhering to the CVT
-standard is printed. This modeline can be included in __xservername__
-.B __xconfigfile__(__filemansuffix__)
+standard is printed. This modeline can be included in Xorg
+.B xorg.conf(__filemansuffix__)
 .
 
 .SH OPTIONS
@@ -31,7 +31,7 @@ Create a mode with reduced blanking.  This allows for higher frequency signals,
 with a lower or equal dotclock. Not for Cathode Ray Tube based displays though.
 
 .SH "SEE ALSO"
-__xconfigfile__(__filemansuffix__), gtf(__appmansuffix__)
+xorg.conf(__filemansuffix__), gtf(__appmansuffix__)
 .SH AUTHOR
 Luc Verhaegen.
 .PP
diff --git a/xorg-server/hw/xfree86/utils/man/gtf.man b/xorg-server/hw/xfree86/utils/man/gtf.man
index 8e83650aa..004d2f059 100644
--- a/xorg-server/hw/xfree86/utils/man/gtf.man
+++ b/xorg-server/hw/xfree86/utils/man/gtf.man
@@ -14,8 +14,8 @@ gtf - calculate VESA GTF mode lines
 is a utility for calculating VESA GTF modes.  Given the desired
 horizontal and vertical resolutions and refresh rate (in Hz), the parameters
 for a matching VESA GTF mode are printed out.  Two output formats are
-supported: mode lines suitable for the __xservername__
-.B __xconfigfile__(__filemansuffix__)
+supported: mode lines suitable for the Xorg
+.B xorg.conf(__filemansuffix__)
 file, and mode parameters suitable for the Linux
 .B fbset(8)
 utility.
@@ -27,14 +27,14 @@ Enable verbose printouts  This shows a trace for each step of the
 computation.
 .TP 8
 .BR \-x | \-\-xorgmode
-Print the mode parameters as __xservername__-style mode lines.  This is the
+Print the mode parameters as Xorg-style mode lines.  This is the
 default format.
 .TP 8
 .BR \-f | \-\-fbset
 Print the mode parameters in a format suitable for
 .BR fbset(8) .
 .SH "SEE ALSO"
-__xconfigfile__(__filemansuffix__), cvt(__appmansuffix__)
+xorg.conf(__filemansuffix__), cvt(__appmansuffix__)
 .SH AUTHOR
 Andy Ritger.
 .PP
diff --git a/xorg-server/hw/xnest/Init.c b/xorg-server/hw/xnest/Init.c
index 0909826d9..330b8ca17 100644
--- a/xorg-server/hw/xnest/Init.c
+++ b/xorg-server/hw/xnest/Init.c
@@ -142,7 +142,7 @@ OsVendorInit(void)
 }
 
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
     return;
 }
diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c
index 4624fd4db..4702595f4 100644
--- a/xorg-server/hw/xquartz/GL/capabilities.c
+++ b/xorg-server/hw/xquartz/GL/capabilities.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Apple Inc.
+ * Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 #define Cursor Mac_Cursor
-#define BOOL Mac_BOOL
+#define BOOL   Mac_BOOL
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
@@ -120,7 +120,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
 {
     int offset = 0;
 
-    /*1 */
+    /*1*/
     if (kCGLRGB444Bit & cmodes) {
         c[offset].r = 4;
         c[offset].g = 4;
@@ -128,7 +128,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*2 */
+    /*2*/
     if (kCGLARGB4444Bit & cmodes) {
         c[offset].a = 4;
         c[offset].r = 4;
@@ -138,7 +138,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*3 */
+    /*3*/
     if (kCGLRGB444A8Bit & cmodes) {
         c[offset].r = 4;
         c[offset].g = 4;
@@ -147,7 +147,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*4 */
+    /*4*/
     if (kCGLRGB555Bit & cmodes) {
         c[offset].r = 5;
         c[offset].g = 5;
@@ -155,7 +155,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*5 */
+    /*5*/
     if (kCGLARGB1555Bit & cmodes) {
         c[offset].a = 1;
         c[offset].r = 5;
@@ -165,7 +165,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*6 */
+    /*6*/
     if (kCGLRGB555A8Bit & cmodes) {
         c[offset].r = 5;
         c[offset].g = 5;
@@ -174,7 +174,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*7 */
+    /*7*/
     if (kCGLRGB565Bit & cmodes) {
         c[offset].r = 5;
         c[offset].g = 6;
@@ -182,7 +182,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*8 */
+    /*8*/
     if (kCGLRGB565A8Bit & cmodes) {
         c[offset].r = 5;
         c[offset].g = 6;
@@ -191,7 +191,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*9 */
+    /*9*/
     if (kCGLRGB888Bit & cmodes) {
         c[offset].r = 8;
         c[offset].g = 8;
@@ -199,7 +199,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*10 */
+    /*10*/
     if (kCGLARGB8888Bit & cmodes) {
         c[offset].a = 8;
         c[offset].r = 8;
@@ -209,7 +209,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
         ++offset;
     }
 
-    /*11 */
+    /*11*/
     if (kCGLRGB888A8Bit & cmodes) {
         c[offset].r = 8;
         c[offset].g = 8;
@@ -219,16 +219,16 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
     }
 
     if (forAccum) {
-//#if 0
+        //#if 0
         /* FIXME
-         * Disable this path, because some part of libGL, X, or Xplugin 
+         * Disable this path, because some part of libGL, X, or Xplugin
          * doesn't work with sizes greater than 8.
          * When this is enabled and visuals are chosen using depths
          * such as 16, the result is that the windows don't redraw
          * and are often white, until a resize.
          */
 
-        /*12 */
+        /*12*/
         if (kCGLRGB101010Bit & cmodes) {
             c[offset].r = 10;
             c[offset].g = 10;
@@ -236,7 +236,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
 
-        /*13 */
+        /*13*/
         if (kCGLARGB2101010Bit & cmodes) {
             c[offset].a = 2;
             c[offset].r = 10;
@@ -246,7 +246,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
 
-        /*14 */
+        /*14*/
         if (kCGLRGB101010_A8Bit & cmodes) {
             c[offset].r = 10;
             c[offset].g = 10;
@@ -255,7 +255,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
 
-        /*15 */
+        /*15*/
         if (kCGLRGB121212Bit & cmodes) {
             c[offset].r = 12;
             c[offset].g = 12;
@@ -263,7 +263,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
 
-        /*16 */
+        /*16*/
         if (kCGLARGB12121212Bit & cmodes) {
             c[offset].a = 12;
             c[offset].r = 12;
@@ -273,7 +273,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
 
-        /*17 */
+        /*17*/
         if (kCGLRGB161616Bit & cmodes) {
             c[offset].r = 16;
             c[offset].g = 16;
@@ -281,7 +281,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
 
-        /*18 */
+        /*18*/
         if (kCGLRGBA16161616Bit & cmodes) {
             c[offset].r = 16;
             c[offset].g = 16;
@@ -290,7 +290,7 @@ handleColorAndAccumulation(struct glColorBufCapabilities *c,
             ++offset;
         }
     }
-//#endif
+    //#endif
 
     /* FIXME should we handle the floating point color modes, and if so, how? */
 
@@ -318,46 +318,45 @@ static void
 handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes)
 {
     int offset = 0;
+#define DEPTH(flag, value) do { \
+        if (dmodes & flag) { \
+            c->depth_buffers[offset++] = value; \
+        } \
+} while (0)
 
-#define DEPTH(flag,value) do { \
-	if(dmodes & flag) { \
-	    c->depth_buffers[offset++] = value; \
-	} \
-    } while(0)
-
-    /*1 */
+    /*1*/
     DEPTH(kCGL0Bit, 0);
-    /*2 */
+    /*2*/
     DEPTH(kCGL1Bit, 1);
-    /*3 */
+    /*3*/
     DEPTH(kCGL2Bit, 2);
-    /*4 */
+    /*4*/
     DEPTH(kCGL3Bit, 3);
-    /*5 */
+    /*5*/
     DEPTH(kCGL4Bit, 4);
-    /*6 */
+    /*6*/
     DEPTH(kCGL5Bit, 5);
-    /*7 */
+    /*7*/
     DEPTH(kCGL6Bit, 6);
-    /*8 */
+    /*8*/
     DEPTH(kCGL8Bit, 8);
-    /*9 */
+    /*9*/
     DEPTH(kCGL10Bit, 10);
-    /*10 */
+    /*10*/
     DEPTH(kCGL12Bit, 12);
-    /*11 */
+    /*11*/
     DEPTH(kCGL16Bit, 16);
-    /*12 */
+    /*12*/
     DEPTH(kCGL24Bit, 24);
-    /*13 */
+    /*13*/
     DEPTH(kCGL32Bit, 32);
-    /*14 */
+    /*14*/
     DEPTH(kCGL48Bit, 48);
-    /*15 */
+    /*15*/
     DEPTH(kCGL64Bit, 64);
-    /*16 */
+    /*16*/
     DEPTH(kCGL96Bit, 96);
-    /*17 */
+    /*17*/
     DEPTH(kCGL128Bit, 128);
 
 #undef DEPTH
@@ -483,8 +482,9 @@ initConfig(struct glCapabilitiesConfig *c)
 
     for (i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
         c->color_buffers[i].r = c->color_buffers[i].g =
-            c->color_buffers[i].b = c->color_buffers[i].a =
-            GLCAPS_COLOR_BUF_INVALID_VALUE;
+                                    c->color_buffers[i].b =
+                                        c->color_buffers[i].a =
+                                            GLCAPS_COLOR_BUF_INVALID_VALUE;
         c->color_buffers[i].is_argb = false;
     }
 
@@ -492,8 +492,9 @@ initConfig(struct glCapabilitiesConfig *c)
 
     for (i = 0; i < GLCAPS_COLOR_BUFFERS; ++i) {
         c->accum_buffers[i].r = c->accum_buffers[i].g =
-            c->accum_buffers[i].b = c->accum_buffers[i].a =
-            GLCAPS_COLOR_BUF_INVALID_VALUE;
+                                    c->accum_buffers[i].b =
+                                        c->accum_buffers[i].a =
+                                            GLCAPS_COLOR_BUF_INVALID_VALUE;
         c->accum_buffers[i].is_argb = false;
     }
 
@@ -540,7 +541,8 @@ getGlCapabilities(struct glCapabilities *cap)
         err = handleRendererDescriptions(info, r, &tmpconf);
         if (err) {
             ErrorF("handleRendererDescriptions returned error: %s\n",
-                   CGLErrorString(err));
+                   CGLErrorString(
+                       err));
             ErrorF("trying to continue...\n");
             continue;
         }
diff --git a/xorg-server/hw/xquartz/GL/capabilities.h b/xorg-server/hw/xquartz/GL/capabilities.h
index 361856b07..62b3ac25a 100644
--- a/xorg-server/hw/xquartz/GL/capabilities.h
+++ b/xorg-server/hw/xquartz/GL/capabilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Apple Inc.
+ * Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -55,12 +55,14 @@ struct glCapabilitiesConfig {
     struct glCapabilitiesConfig *next;
 };
 
-struct glCapabilities  {
+struct glCapabilities {
     struct glCapabilitiesConfig *configurations;
     int total_configurations;
 };
 
-bool getGlCapabilities(struct glCapabilities *cap);
-void freeGlCapabilities(struct glCapabilities *cap);
+bool
+getGlCapabilities(struct glCapabilities *cap);
+void
+freeGlCapabilities(struct glCapabilities *cap);
 
 #endif
diff --git a/xorg-server/hw/xquartz/GL/glcontextmodes.c b/xorg-server/hw/xquartz/GL/glcontextmodes.c
index 79fadf876..dc97f89e4 100644
--- a/xorg-server/hw/xquartz/GL/glcontextmodes.c
+++ b/xorg-server/hw/xquartz/GL/glcontextmodes.c
@@ -47,31 +47,31 @@
 #include <stdlib.h>
 #include <string.h>
 #define _mesa_malloc(b) malloc(b)
-#define _mesa_free(m) free(m)
-#define _mesa_memset  memset
+#define _mesa_free(m)   free(m)
+#define _mesa_memset memset
 #else
 #ifdef XFree86Server
 #include <os.h>
 #include <string.h>
 #define _mesa_malloc(b) malloc(b)
 #define _mesa_free(m)   free(m)
-#define _mesa_memset   memset
+#define _mesa_memset memset
 #else
 #include <X11/Xlibint.h>
 #define _mesa_memset memset
 #define _mesa_malloc(b) Xmalloc(b)
-#define _mesa_free(m) free(m)
-#endif                          /* XFree86Server */
-#endif                          /* !defined(IN_MINI_GLX) */
+#define _mesa_free(m)   free(m)
+#endif  /* XFree86Server */
+#endif /* !defined(IN_MINI_GLX) */
 
 #include "glcontextmodes.h"
 
 #if !defined(IN_MINI_GLX)
-#define NUM_VISUAL_TYPES   6
+#define NUM_VISUAL_TYPES 6
 
 /**
  * Convert an X visual type to a GLX visual type.
- * 
+ *
  * \param visualType X visual type (i.e., \c TrueColor, \c StaticGray, etc.)
  *        to be converted.
  * \return If \c visualType is a valid X visual type, a GLX visual type will
@@ -81,19 +81,19 @@ GLint
 _gl_convert_from_x_visual_type(int visualType)
 {
     static const int glx_visual_types[NUM_VISUAL_TYPES] = {
-        GLX_STATIC_GRAY, GLX_GRAY_SCALE,
+        GLX_STATIC_GRAY,  GLX_GRAY_SCALE,
         GLX_STATIC_COLOR, GLX_PSEUDO_COLOR,
-        GLX_TRUE_COLOR, GLX_DIRECT_COLOR
+        GLX_TRUE_COLOR,   GLX_DIRECT_COLOR
     };
 
-    return ((unsigned) visualType < NUM_VISUAL_TYPES)
-        ? glx_visual_types[visualType] : GLX_NONE;
+    return ((unsigned)visualType < NUM_VISUAL_TYPES)
+           ? glx_visual_types[visualType] : GLX_NONE;
 }
 
 /**
  * Convert a GLX visual type to an X visual type.
- * 
- * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR, 
+ *
+ * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR,
  *                   \c GLX_STATIC_GRAY, etc.) to be converted.
  * \return If \c visualType is a valid GLX visual type, an X visual type will
  *         be returned.  Otherwise -1 will be returned.
@@ -102,13 +102,13 @@ GLint
 _gl_convert_to_x_visual_type(int visualType)
 {
     static const int x_visual_types[NUM_VISUAL_TYPES] = {
-        TrueColor, DirectColor,
+        TrueColor,   DirectColor,
         PseudoColor, StaticColor,
-        GrayScale, StaticGray
+        GrayScale,   StaticGray
     };
 
-    return ((unsigned) (visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES)
-        ? x_visual_types[visualType - GLX_TRUE_COLOR] : -1;
+    return ((unsigned)(visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES)
+           ? x_visual_types[visualType - GLX_TRUE_COLOR] : -1;
 }
 
 /**
@@ -117,10 +117,10 @@ _gl_convert_to_x_visual_type(int visualType)
  * \c mode that can be derrived from the fields of \c config (i.e.,
  * \c haveDepthBuffer) are also filled in.  The remaining fields in \c mode
  * that cannot be derived are set to default values.
- * 
+ *
  * \param mode   Destination GL context mode.
  * \param config Source GLX visual config.
- * 
+ *
  * \note
  * The \c fbconfigID and \c visualID fields of the \c __GLcontextModes
  * structure will be set to the \c vid of the \c __GLXvisualConfig structure.
@@ -129,9 +129,9 @@ void
 _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
                                 const __GLXvisualConfig * config)
 {
-    __GLcontextModes *const next = mode->next;
+    __GLcontextModes * const next = mode->next;
 
-    (void) _mesa_memset(mode, 0, sizeof(__GLcontextModes));
+    (void)_mesa_memset(mode, 0, sizeof(__GLcontextModes));
     mode->next = next;
 
     mode->visualID = config->vid;
@@ -190,17 +190,18 @@ _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
 
     mode->bindToTextureRgb = (mode->rgbMode) ? GL_TRUE : GL_FALSE;
     mode->bindToTextureRgba = (mode->rgbMode && mode->alphaBits) ?
-        GL_TRUE : GL_FALSE;
+                              GL_TRUE : GL_FALSE;
     mode->bindToMipmapTexture = mode->rgbMode ? GL_TRUE : GL_FALSE;
     mode->bindToTextureTargets = mode->rgbMode ?
-        GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT |
-        GLX_TEXTURE_RECTANGLE_BIT_EXT : 0;
+                                 GLX_TEXTURE_1D_BIT_EXT |
+                                 GLX_TEXTURE_2D_BIT_EXT |
+                                 GLX_TEXTURE_RECTANGLE_BIT_EXT : 0;
     mode->yInverted = GL_FALSE;
 }
 
 /**
  * Get data from a GL context mode.
- * 
+ *
  * \param mode         GL context mode whose data is to be returned.
  * \param attribute    Attribute of \c mode that is to be returned.
  * \param value_return Location to store the data member of \c mode.
@@ -208,151 +209,193 @@ _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
  *          returned.  Otherwise \c GLX_BAD_ATTRIBUTE is returned.
  */
 int
-_gl_get_context_mode_data(const __GLcontextModes * mode, int attribute,
+_gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
                           int *value_return)
 {
     switch (attribute) {
     case GLX_USE_GL:
         *value_return = GL_TRUE;
         return 0;
+
     case GLX_BUFFER_SIZE:
         *value_return = mode->rgbBits;
         return 0;
+
     case GLX_RGBA:
         *value_return = mode->rgbMode;
         return 0;
+
     case GLX_RED_SIZE:
         *value_return = mode->redBits;
         return 0;
+
     case GLX_GREEN_SIZE:
         *value_return = mode->greenBits;
         return 0;
+
     case GLX_BLUE_SIZE:
         *value_return = mode->blueBits;
         return 0;
+
     case GLX_ALPHA_SIZE:
         *value_return = mode->alphaBits;
         return 0;
+
     case GLX_DOUBLEBUFFER:
         *value_return = mode->doubleBufferMode;
         return 0;
+
     case GLX_STEREO:
         *value_return = mode->stereoMode;
         return 0;
+
     case GLX_AUX_BUFFERS:
         *value_return = mode->numAuxBuffers;
         return 0;
+
     case GLX_DEPTH_SIZE:
         *value_return = mode->depthBits;
         return 0;
+
     case GLX_STENCIL_SIZE:
         *value_return = mode->stencilBits;
         return 0;
+
     case GLX_ACCUM_RED_SIZE:
         *value_return = mode->accumRedBits;
         return 0;
+
     case GLX_ACCUM_GREEN_SIZE:
         *value_return = mode->accumGreenBits;
         return 0;
+
     case GLX_ACCUM_BLUE_SIZE:
         *value_return = mode->accumBlueBits;
         return 0;
+
     case GLX_ACCUM_ALPHA_SIZE:
         *value_return = mode->accumAlphaBits;
         return 0;
+
     case GLX_LEVEL:
         *value_return = mode->level;
         return 0;
+
     case GLX_TRANSPARENT_TYPE_EXT:
         *value_return = mode->transparentPixel;
         return 0;
+
     case GLX_TRANSPARENT_RED_VALUE:
         *value_return = mode->transparentRed;
         return 0;
+
     case GLX_TRANSPARENT_GREEN_VALUE:
         *value_return = mode->transparentGreen;
         return 0;
+
     case GLX_TRANSPARENT_BLUE_VALUE:
         *value_return = mode->transparentBlue;
         return 0;
+
     case GLX_TRANSPARENT_ALPHA_VALUE:
         *value_return = mode->transparentAlpha;
         return 0;
+
     case GLX_TRANSPARENT_INDEX_VALUE:
         *value_return = mode->transparentIndex;
         return 0;
+
     case GLX_X_VISUAL_TYPE:
         *value_return = mode->visualType;
         return 0;
+
     case GLX_CONFIG_CAVEAT:
         *value_return = mode->visualRating;
         return 0;
+
     case GLX_VISUAL_ID:
         *value_return = mode->visualID;
         return 0;
+
     case GLX_DRAWABLE_TYPE:
         *value_return = mode->drawableType;
         return 0;
+
     case GLX_RENDER_TYPE:
         *value_return = mode->renderType;
         return 0;
+
     case GLX_X_RENDERABLE:
         *value_return = mode->xRenderable;
         return 0;
+
     case GLX_FBCONFIG_ID:
         *value_return = mode->fbconfigID;
         return 0;
+
     case GLX_MAX_PBUFFER_WIDTH:
         *value_return = mode->maxPbufferWidth;
         return 0;
+
     case GLX_MAX_PBUFFER_HEIGHT:
         *value_return = mode->maxPbufferHeight;
         return 0;
+
     case GLX_MAX_PBUFFER_PIXELS:
         *value_return = mode->maxPbufferPixels;
         return 0;
+
     case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX:
         *value_return = mode->optimalPbufferWidth;
         return 0;
+
     case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX:
         *value_return = mode->optimalPbufferHeight;
         return 0;
+
     case GLX_SWAP_METHOD_OML:
         *value_return = mode->swapMethod;
         return 0;
+
     case GLX_SAMPLE_BUFFERS_SGIS:
         *value_return = mode->sampleBuffers;
         return 0;
+
     case GLX_SAMPLES_SGIS:
         *value_return = mode->samples;
         return 0;
+
     case GLX_BIND_TO_TEXTURE_RGB_EXT:
         *value_return = mode->bindToTextureRgb;
         return 0;
+
     case GLX_BIND_TO_TEXTURE_RGBA_EXT:
         *value_return = mode->bindToTextureRgba;
         return 0;
+
     case GLX_BIND_TO_MIPMAP_TEXTURE_EXT:
         *value_return = mode->bindToMipmapTexture == GL_TRUE ? GL_TRUE :
-            GL_FALSE;
+                        GL_FALSE;
         return 0;
+
     case GLX_BIND_TO_TEXTURE_TARGETS_EXT:
         *value_return = mode->bindToTextureTargets;
         return 0;
+
     case GLX_Y_INVERTED_EXT:
         *value_return = mode->yInverted;
         return 0;
 
-        /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.
-         * It is ONLY for communication between the GLX client and the GLX
-         * server.
-         */
+    /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX.
+     * It is ONLY for communication between the GLX client and the GLX
+     * server.
+     */
     case GLX_VISUAL_SELECT_GROUP_SGIX:
     default:
         return GLX_BAD_ATTRIBUTE;
     }
 }
-#endif                          /* !defined(IN_MINI_GLX) */
+#endif /* !defined(IN_MINI_GLX) */
 
 /**
  * Allocate a linked list of \c __GLcontextModes structures.  The fields of
@@ -362,7 +405,7 @@ _gl_get_context_mode_data(const __GLcontextModes * mode, int attribute,
  * zero or \c GLX_DONT_CARE (which is -1).  As support for additional
  * extensions is added, the new values will be initialized to appropriate
  * values from the extension specification.
- * 
+ *
  * \param count         Number of structures to allocate.
  * \param minimum_size  Minimum size of a structure to allocate.  This allows
  *                      for differences in the version of the
@@ -370,7 +413,7 @@ _gl_get_context_mode_data(const __GLcontextModes * mode, int attribute,
  *                      DRI-based driver.
  * \returns A pointer to the first element in a linked list of \c count
  *          stuctures on success, or \c NULL on failure.
- * 
+ *
  * \warning Use of \c minimum_size does \b not guarantee binary compatibility.
  *          The fundamental assumption is that if the \c minimum_size
  *          specified by the driver and the size of the \c __GLcontextModes
@@ -384,21 +427,21 @@ __GLcontextModes *
 _gl_context_modes_create(unsigned count, size_t minimum_size)
 {
     const size_t size = (minimum_size > sizeof(__GLcontextModes))
-        ? minimum_size : sizeof(__GLcontextModes);
-    __GLcontextModes *base = NULL;
-    __GLcontextModes **next;
+                        ? minimum_size : sizeof(__GLcontextModes);
+    __GLcontextModes * base = NULL;
+    __GLcontextModes ** next;
     unsigned i;
 
     next = &base;
     for (i = 0; i < count; i++) {
-        *next = (__GLcontextModes *) _mesa_malloc(size);
+        *next = (__GLcontextModes *)_mesa_malloc(size);
         if (*next == NULL) {
             _gl_context_modes_destroy(base);
             base = NULL;
             break;
         }
 
-        (void) _mesa_memset(*next, 0, size);
+        (void)_mesa_memset(*next, 0, size);
         (*next)->visualID = GLX_DONT_CARE;
         (*next)->visualType = GLX_DONT_CARE;
         (*next)->visualRating = GLX_NONE;
@@ -426,7 +469,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size)
 /**
  * Destroy a linked list of \c __GLcontextModes structures created by
  * \c _gl_context_modes_create.
- * 
+ *
  * \param modes  Linked list of structures to be destroyed.  All structres
  *               in the list will be freed.
  */
@@ -434,7 +477,7 @@ void
 _gl_context_modes_destroy(__GLcontextModes * modes)
 {
     while (modes != NULL) {
-        __GLcontextModes *const next = modes->next;
+        __GLcontextModes * const next = modes->next;
 
         _mesa_free(modes);
         modes = next;
@@ -451,7 +494,7 @@ _gl_context_modes_destroy(__GLcontextModes * modes)
  */
 
 __GLcontextModes *
-_gl_context_modes_find_visual(__GLcontextModes * modes, int vid)
+_gl_context_modes_find_visual(__GLcontextModes *modes, int vid)
 {
     __GLcontextModes *m;
 
@@ -463,7 +506,7 @@ _gl_context_modes_find_visual(__GLcontextModes * modes, int vid)
 }
 
 __GLcontextModes *
-_gl_context_modes_find_fbconfig(__GLcontextModes * modes, int fbid)
+_gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid)
 {
     __GLcontextModes *m;
 
@@ -477,7 +520,7 @@ _gl_context_modes_find_fbconfig(__GLcontextModes * modes, int fbid)
 /**
  * Determine if two context-modes are the same.  This is intended to be used
  * by libGL implementations to compare to sets of driver generated FBconfigs.
- * 
+ *
  * \param a  Context-mode to be compared.
  * \param b  Context-mode to be compared.
  * \returns \c GL_TRUE if the two context-modes are the same.  \c GL_FALSE is
@@ -494,11 +537,13 @@ _gl_context_modes_are_same(const __GLcontextModes * a,
             (a->stereoMode == b->stereoMode) &&
             (a->redBits == b->redBits) &&
             (a->greenBits == b->greenBits) &&
-            (a->blueBits == b->blueBits) && (a->alphaBits == b->alphaBits) &&
-#if 0                           /* For some reason these don't get set on the client-side in libGL. */
+            (a->blueBits == b->blueBits) &&
+            (a->alphaBits == b->alphaBits) &&
+#if 0 /* For some reason these don't get set on the client-side in libGL. */
             (a->redMask == b->redMask) &&
             (a->greenMask == b->greenMask) &&
-            (a->blueMask == b->blueMask) && (a->alphaMask == b->alphaMask) &&
+            (a->blueMask == b->blueMask) &&
+            (a->alphaMask == b->alphaMask) &&
 #endif
             (a->rgbBits == b->rgbBits) &&
             (a->indexBits == b->indexBits) &&
@@ -512,14 +557,18 @@ _gl_context_modes_are_same(const __GLcontextModes * a,
             (a->level == b->level) &&
             (a->pixmapMode == b->pixmapMode) &&
             (a->visualRating == b->visualRating) &&
+
             (a->transparentPixel == b->transparentPixel) &&
+
             ((a->transparentPixel != GLX_TRANSPARENT_RGB) ||
              ((a->transparentRed == b->transparentRed) &&
               (a->transparentGreen == b->transparentGreen) &&
               (a->transparentBlue == b->transparentBlue) &&
               (a->transparentAlpha == b->transparentAlpha))) &&
+
             ((a->transparentPixel != GLX_TRANSPARENT_INDEX) ||
              (a->transparentIndex == b->transparentIndex)) &&
+
             (a->sampleBuffers == b->sampleBuffers) &&
             (a->samples == b->samples) &&
             ((a->drawableType & b->drawableType) != 0) &&
diff --git a/xorg-server/hw/xquartz/GL/glcontextmodes.h b/xorg-server/hw/xquartz/GL/glcontextmodes.h
index 871c2e1b3..7237ccc06 100644
--- a/xorg-server/hw/xquartz/GL/glcontextmodes.h
+++ b/xorg-server/hw/xquartz/GL/glcontextmodes.h
@@ -33,22 +33,28 @@
 #include "GL/internal/glcore.h"
 
 #if !defined(IN_MINI_GLX)
-extern GLint _gl_convert_from_x_visual_type(int visualType);
-extern GLint _gl_convert_to_x_visual_type(int visualType);
-extern void _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
-                                            const __GLXvisualConfig * config);
-extern int _gl_get_context_mode_data(const __GLcontextModes * mode,
-                                     int attribute, int *value_return);
-#endif                          /* !defined(IN_MINI_GLX) */
+extern GLint
+_gl_convert_from_x_visual_type(int visualType);
+extern GLint
+_gl_convert_to_x_visual_type(int visualType);
+extern void
+_gl_copy_visual_to_context_mode(__GLcontextModes * mode,
+                                const __GLXvisualConfig * config);
+extern int
+_gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
+                          int *value_return);
+#endif /* !defined(IN_MINI_GLX) */
 
-extern __GLcontextModes *_gl_context_modes_create(unsigned count,
-                                                  size_t minimum_size);
-extern void _gl_context_modes_destroy(__GLcontextModes * modes);
-extern __GLcontextModes *_gl_context_modes_find_visual(__GLcontextModes * modes,
-                                                       int vid);
-extern __GLcontextModes *_gl_context_modes_find_fbconfig(__GLcontextModes *
-                                                         modes, int fbid);
-extern GLboolean _gl_context_modes_are_same(const __GLcontextModes * a,
-                                            const __GLcontextModes * b);
+extern __GLcontextModes *
+_gl_context_modes_create(unsigned count, size_t minimum_size);
+extern void
+_gl_context_modes_destroy(__GLcontextModes * modes);
+extern __GLcontextModes *
+_gl_context_modes_find_visual(__GLcontextModes *modes, int vid);
+extern __GLcontextModes *
+_gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid);
+extern GLboolean
+_gl_context_modes_are_same(const __GLcontextModes * a,
+                           const __GLcontextModes * b);
 
-#endif                          /* GLCONTEXTMODES_H */
+#endif /* GLCONTEXTMODES_H */
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index 1f4f79c4b..d9dc2a15b 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -2,7 +2,7 @@
  * GLX implementation that uses Apple's OpenGL.framework
  * (Indirect rendering path -- it's also used for some direct mode code too)
  *
- * Copyright (c) 2007-2011 Apple Inc.
+ * Copyright (c) 2007-2012 Apple Inc.
  * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
  * Copyright (c) 2002 Greg Parker. All Rights Reserved.
  *
@@ -40,7 +40,7 @@
 #include <dlfcn.h>
 
 #include <OpenGL/OpenGL.h>
-#include <OpenGL/gl.h>          /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */
+#include <OpenGL/gl.h>     /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */
 
 #include <X11/Xproto.h>
 #include <GL/glxproto.h>
@@ -56,30 +56,41 @@
 #include "dri.h"
 
 #include "darwin.h"
-#define GLAQUA_DEBUG_MSG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", msg, ##args)
+#define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \
+                                                msg, \
+                                                ## args)
 
-__GLXprovider *GlxGetDRISWrastProvider(void);
+__GLXprovider *
+GlxGetDRISWrastProvider(void);
 
-static void setup_dispatch_table(void);
-GLuint __glFloorLog2(GLuint val);
-void warn_func(void *p1, char *format, ...);
+static void
+setup_dispatch_table(void);
+GLuint
+__glFloorLog2(GLuint val);
+void
+warn_func(void * p1, char *format, ...);
 
 // some prototypes
-static __GLXscreen *__glXAquaScreenProbe(ScreenPtr pScreen);
-static __GLXdrawable *__glXAquaScreenCreateDrawable(ClientPtr client,
-                                                    __GLXscreen * screen,
-                                                    DrawablePtr pDraw,
-                                                    XID drawId, int type,
-                                                    XID glxDrawId,
-                                                    __GLXconfig * conf);
-
-static void __glXAquaContextDestroy(__GLXcontext * baseContext);
-static int __glXAquaContextMakeCurrent(__GLXcontext * baseContext);
-static int __glXAquaContextLoseCurrent(__GLXcontext * baseContext);
-static int __glXAquaContextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
-                                unsigned long mask);
-
-static CGLPixelFormatObj makeFormat(__GLXconfig * conf);
+static __GLXscreen *
+__glXAquaScreenProbe(ScreenPtr pScreen);
+static __GLXdrawable *
+__glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen,
+                              DrawablePtr pDraw, XID drawId, int type,
+                              XID glxDrawId,
+                              __GLXconfig *conf);
+
+static void
+__glXAquaContextDestroy(__GLXcontext *baseContext);
+static int
+__glXAquaContextMakeCurrent(__GLXcontext *baseContext);
+static int
+__glXAquaContextLoseCurrent(__GLXcontext *baseContext);
+static int
+__glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc,
+                     unsigned long mask);
+
+static CGLPixelFormatObj
+makeFormat(__GLXconfig *conf);
 
 __GLXprovider __glXDRISWRastProvider = {
     __glXAquaScreenProbe,
@@ -94,9 +105,9 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable;
 /*
  * The following structs must keep the base as the first member.
  * It's used to treat the start of the struct as a different struct
- * in GLX.  
+ * in GLX.
  *
- * Note: these structs should be initialized with xcalloc or memset 
+ * Note: these structs should be initialized with xcalloc or memset
  * prior to usage, and some of them require initializing
  * the base with function pointers.
  */
@@ -111,7 +122,7 @@ struct __GLXAquaContext {
     CGLContextObj ctx;
     CGLPixelFormatObj pixelFormat;
     xp_surface_id sid;
-    unsigned isAttached:1;
+    unsigned isAttached : 1;
 };
 
 struct __GLXAquaDrawable {
@@ -122,12 +133,12 @@ struct __GLXAquaDrawable {
 };
 
 static __GLXcontext *
-__glXAquaScreenCreateContext(__GLXscreen * screen,
-                             __GLXconfig * conf,
-                             __GLXcontext * baseShareContext)
+__glXAquaScreenCreateContext(__GLXscreen *screen,
+                             __GLXconfig *conf,
+                             __GLXcontext *baseShareContext)
 {
     __GLXAquaContext *context;
-    __GLXAquaContext *shareContext = (__GLXAquaContext *) baseShareContext;
+    __GLXAquaContext *shareContext = (__GLXAquaContext *)baseShareContext;
     CGLError gl_err;
 
     GLAQUA_DEBUG_MSG("glXAquaScreenCreateContext\n");
@@ -176,21 +187,21 @@ __glXAquaScreenCreateContext(__GLXscreen * screen,
 static x_hash_table *surface_hash;
 
 static void
-__glXAquaContextDestroy(__GLXcontext * baseContext)
+__glXAquaContextDestroy(__GLXcontext *baseContext)
 {
     x_list *lst;
 
-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
+    __GLXAquaContext *context = (__GLXAquaContext *)baseContext;
 
     GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);
     if (context != NULL) {
         if (context->sid != 0 && surface_hash != NULL) {
             lst =
-                x_hash_table_lookup(surface_hash,
-                                    x_cvt_uint_to_vptr(context->sid), NULL);
+                x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(
+                                        context->sid), NULL);
             lst = x_list_remove(lst, context);
-            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid),
-                                lst);
+            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(
+                                    context->sid), lst);
         }
 
         if (context->ctx != NULL)
@@ -204,7 +215,7 @@ __glXAquaContextDestroy(__GLXcontext * baseContext)
 }
 
 static int
-__glXAquaContextLoseCurrent(__GLXcontext * baseContext)
+__glXAquaContextLoseCurrent(__GLXcontext *baseContext)
 {
     CGLError gl_err;
 
@@ -214,9 +225,9 @@ __glXAquaContextLoseCurrent(__GLXcontext * baseContext)
     if (gl_err != 0)
         ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
 
-    /* 
+    /*
      * There should be no need to set __glXLastContext to NULL here, because
-     * glxcmds.c does it as part of the context cache flush after calling 
+     * glxcmds.c does it as part of the context cache flush after calling
      * this.
      */
 
@@ -228,11 +239,10 @@ __glXAquaContextLoseCurrent(__GLXcontext * baseContext)
 static void
 surface_notify(void *_arg, void *data)
 {
-    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *) _arg;
-    __GLXAquaDrawable *draw = (__GLXAquaDrawable *) data;
+    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *)_arg;
+    __GLXAquaDrawable *draw = (__GLXAquaDrawable *)data;
     __GLXAquaContext *context;
     x_list *lst;
-
     if (_arg == NULL || data == NULL) {
         ErrorF("surface_notify called with bad params");
         return;
@@ -250,14 +260,15 @@ surface_notify(void *_arg, void *data)
     case AppleDRISurfaceNotifyChanged:
         if (surface_hash != NULL) {
             lst =
-                x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id),
-                                    NULL);
+                x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(
+                                        arg->id), NULL);
             for (; lst != NULL; lst = lst->next) {
                 context = lst->data;
                 xp_update_gl_context(context->ctx);
             }
         }
         break;
+
     default:
         ErrorF("surface_notify: unknown kind %d\n", arg->kind);
         break;
@@ -265,7 +276,7 @@ surface_notify(void *_arg, void *data)
 }
 
 static BOOL
-attach(__GLXAquaContext * context, __GLXAquaDrawable * draw)
+attach(__GLXAquaContext *context, __GLXAquaDrawable *draw)
 {
     DrawablePtr pDraw;
 
@@ -284,7 +295,8 @@ attach(__GLXAquaContext * context, __GLXAquaDrawable * draw)
     if (draw->sid == 0) {
         //if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,
         if (!DRICreateSurface(pDraw->pScreen, pDraw->id, pDraw,
-                              0, &draw->sid, NULL, surface_notify, draw))
+                              0, &draw->sid, NULL,
+                              surface_notify, draw))
             return TRUE;
         draw->pDraw = pDraw;
     }
@@ -311,16 +323,16 @@ attach(__GLXAquaContext * context, __GLXAquaDrawable * draw)
             surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
 
         lst =
-            x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid),
-                                NULL);
+            x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(
+                                    context->sid), NULL);
         if (x_list_find(lst, context) == NULL) {
             lst = x_list_prepend(lst, context);
-            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid),
-                                lst);
+            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(
+                                    context->sid), lst);
         }
 
-        GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int) pDraw->id,
-                         (unsigned int) draw->sid);
+        GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int)pDraw->id,
+                         (unsigned int)draw->sid);
     }
 
     draw->context = context;
@@ -328,12 +340,11 @@ attach(__GLXAquaContext * context, __GLXAquaDrawable * draw)
     return FALSE;
 }
 
-#if 0                           // unused
+#if 0     // unused
 static void
-unattach(__GLXAquaContext * context)
+unattach(__GLXAquaContext *context)
 {
     x_list *lst;
-
     GLAQUA_DEBUG_MSG("unattach\n");
     if (context == NULL) {
         ErrorF("Tried to unattach a null context\n");
@@ -343,10 +354,10 @@ unattach(__GLXAquaContext * context)
         GLAQUA_DEBUG_MSG("unattaching\n");
 
         if (surface_hash != NULL) {
-            lst =
-                x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);
+            lst = x_hash_table_lookup(surface_hash, (void *)context->sid,
+                                      NULL);
             lst = x_list_remove(lst, context);
-            x_hash_table_insert(surface_hash, (void *) context->sid, lst);
+            x_hash_table_insert(surface_hash, (void *)context->sid, lst);
         }
 
         CGLClearDrawable(context->ctx);
@@ -357,16 +368,16 @@ unattach(__GLXAquaContext * context)
 #endif
 
 static int
-__glXAquaContextMakeCurrent(__GLXcontext * baseContext)
+__glXAquaContextMakeCurrent(__GLXcontext *baseContext)
 {
     CGLError gl_err;
-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
-    __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *) context->base.drawPriv;
+    __GLXAquaContext *context = (__GLXAquaContext *)baseContext;
+    __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *)context->base.drawPriv;
 
     GLAQUA_DEBUG_MSG("glAquaMakeCurrent (ctx 0x%p)\n", baseContext);
 
     if (attach(context, drawPriv))
-        return /*error */ 0;
+        return /*error*/ 0;
 
     gl_err = CGLSetCurrentContext(context->ctx);
     if (gl_err != 0)
@@ -376,13 +387,13 @@ __glXAquaContextMakeCurrent(__GLXcontext * baseContext)
 }
 
 static int
-__glXAquaContextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
+__glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc,
                      unsigned long mask)
 {
     CGLError gl_err;
 
-    __GLXAquaContext *dst = (__GLXAquaContext *) baseDst;
-    __GLXAquaContext *src = (__GLXAquaContext *) baseSrc;
+    __GLXAquaContext *dst = (__GLXAquaContext *)baseDst;
+    __GLXAquaContext *src = (__GLXAquaContext *)baseSrc;
 
     GLAQUA_DEBUG_MSG("GLXAquaContextCopy\n");
 
@@ -395,7 +406,7 @@ __glXAquaContextCopy(__GLXcontext * baseDst, __GLXcontext * baseSrc,
 
 /* Drawing surface notification callbacks */
 static GLboolean
-__glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
+__glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base)
 {
     CGLError err;
     __GLXAquaDrawable *drawable;
@@ -407,11 +418,11 @@ __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
         return GL_FALSE;
     }
 
-    drawable = (__GLXAquaDrawable *) base;
+    drawable = (__GLXAquaDrawable *)base;
 
     if (NULL == drawable->context) {
         ErrorF("%s called with a NULL->context for drawable %p!\n",
-               __func__, (void *) drawable);
+               __func__, (void *)drawable);
         return GL_FALSE;
     }
 
@@ -427,7 +438,7 @@ __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
 }
 
 static CGLPixelFormatObj
-makeFormat(__GLXconfig * conf)
+makeFormat(__GLXconfig *conf)
 {
     CGLPixelFormatAttribute attr[64];
     CGLPixelFormatObj fobj;
@@ -451,7 +462,7 @@ makeFormat(__GLXconfig * conf)
 
         attr[i++] = kCGLPFAAccumSize;
         attr[i++] = conf->accumRedBits + conf->accumGreenBits
-            + conf->accumBlueBits + conf->accumAlphaBits;
+                    + conf->accumBlueBits + conf->accumAlphaBits;
     }
 
     attr[i++] = kCGLPFADepthSize;
@@ -486,7 +497,7 @@ makeFormat(__GLXconfig * conf)
 }
 
 static void
-__glXAquaScreenDestroy(__GLXscreen * screen)
+__glXAquaScreenDestroy(__GLXscreen *screen)
 {
 
     GLAQUA_DEBUG_MSG("glXAquaScreenDestroy(%p)\n", screen);
@@ -517,9 +528,8 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
     screen->base.swapInterval = /*FIXME*/ NULL;
     screen->base.pScreen = pScreen;
 
-    screen->base.fbconfigs =
-        __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs,
-                                     pScreen->myNum);
+    screen->base.fbconfigs = __glXAquaCreateVisualConfigs(
+        &screen->base.numFBConfigs, pScreen->myNum);
 
     __glXScreenInit(&screen->base, pScreen);
 
@@ -536,24 +546,24 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
     return &screen->base;
 }
 
-#if 0                           // unused
+#if 0 // unused
 static void
-__glXAquaDrawableCopySubBuffer(__GLXdrawable * drawable,
+__glXAquaDrawableCopySubBuffer(__GLXdrawable *drawable,
                                int x, int y, int w, int h)
 {
-    /*TODO finish me */
+    /*TODO finish me*/
 }
 #endif
 
 static void
-__glXAquaDrawableDestroy(__GLXdrawable * base)
+__glXAquaDrawableDestroy(__GLXdrawable *base)
 {
-    /* gstaplin: base is the head of the structure, so it's at the same 
+    /* gstaplin: base is the head of the structure, so it's at the same
      * offset in memory.
      * Is this safe with strict aliasing?   I noticed that the other dri code
      * does this too...
      */
-    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *) base;
+    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *)base;
 
     GLAQUA_DEBUG_MSG("TRACE");
 
@@ -562,10 +572,10 @@ __glXAquaDrawableDestroy(__GLXdrawable * base)
        frees the surface itself. */
 
     /*gstaplin: verify the statement above.  The surface destroy
-     *messages weren't making it through, and may still not be.
-     *We need a good test case for surface creation and destruction.
-     *We also need a good way to enable introspection on the server
-     *to validate the test, beyond using gdb with print.
+       *messages weren't making it through, and may still not be.
+       *We need a good test case for surface creation and destruction.
+       *We also need a good way to enable introspection on the server
+       *to validate the test, beyond using gdb with print.
      */
 
     free(glxPriv);
@@ -573,10 +583,12 @@ __glXAquaDrawableDestroy(__GLXdrawable * base)
 
 static __GLXdrawable *
 __glXAquaScreenCreateDrawable(ClientPtr client,
-                              __GLXscreen * screen,
+                              __GLXscreen *screen,
                               DrawablePtr pDraw,
                               XID drawId,
-                              int type, XID glxDrawId, __GLXconfig * conf)
+                              int type,
+                              XID glxDrawId,
+                              __GLXconfig *conf)
 {
     __GLXAquaDrawable *glxPriv;
 
@@ -587,8 +599,8 @@ __glXAquaScreenCreateDrawable(ClientPtr client,
 
     memset(glxPriv, 0, sizeof *glxPriv);
 
-    if (!__glXDrawableInit
-        (&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
+    if (!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId,
+                           conf)) {
         free(glxPriv);
         return NULL;
     }
@@ -619,7 +631,8 @@ __glFloorLog2(GLuint val)
 }
 
 #ifndef OPENGL_FRAMEWORK_PATH
-#define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL"
+#define OPENGL_FRAMEWORK_PATH \
+    "/System/Library/Frameworks/OpenGL.framework/OpenGL"
 #endif
 
 static void
@@ -639,7 +652,7 @@ setup_dispatch_table(void)
         opengl_framework_path = OPENGL_FRAMEWORK_PATH;
     }
 
-    (void) dlerror();           /*drain dlerror */
+    (void)dlerror();             /*drain dlerror */
     handle = dlopen(opengl_framework_path, RTLD_LOCAL);
 
     if (!handle) {
diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c
index c02427c99..e37eefbe4 100644
--- a/xorg-server/hw/xquartz/GL/visualConfigs.c
+++ b/xorg-server/hw/xquartz/GL/visualConfigs.c
@@ -73,7 +73,7 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
     }
 
     /*
-       conf->stereo is 0 or 1, but we need at least 1 iteration of the loop, 
+       conf->stereo is 0 or 1, but we need at least 1 iteration of the loop,
        so we treat a true conf->stereo as 2.
 
        The depth size is 0 or 24.  Thus we do 2 iterations for that.
@@ -86,9 +86,9 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
 
        conf->total_color_buffers indicates the RGB/RGBA color depths.
 
-       conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0) 
+       conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0)
 
-       conf->total_depth_buffer_depths 
+       conf->total_depth_buffer_depths
 
        conf->multisample_buffers iterations (with at least 1 if equal to 0).  We add 1
        for the 0 multisampling config.
@@ -104,14 +104,15 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
             continue;
 
         numConfigs += (conf->stereo ? 2 : 1)
-            * (conf->aux_buffers ? 2 : 1)
-            * conf->buffers
-            *
-            ((conf->total_stencil_bit_depths >
-              0) ? conf->total_stencil_bit_depths : 1)
-            * conf->total_color_buffers *
-            ((conf->total_accum_buffers > 0) ? conf->total_accum_buffers : 1)
-            * conf->total_depth_buffer_depths * (conf->multisample_buffers + 1);
+                      * (conf->aux_buffers ? 2 : 1)
+                      * conf->buffers
+                      * ((conf->total_stencil_bit_depths >
+                          0) ? conf->total_stencil_bit_depths : 1)
+                      * conf->total_color_buffers
+                      * ((conf->total_accum_buffers >
+                          0) ? conf->total_accum_buffers : 1)
+                      * conf->total_depth_buffer_depths
+                      * (conf->multisample_buffers + 1);
     }
 
     if (numConfigsPtr)
@@ -125,22 +126,22 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
         return NULL;
     }
 
-    c = visualConfigs;          /* current buffer */
+    c = visualConfigs; /* current buffer */
     for (conf = caps.configurations; conf; conf = conf->next) {
         for (stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
             for (aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
                 for (buffers = 0; buffers < conf->buffers; ++buffers) {
                     for (stencil = 0;
-                         stencil <
-                         ((conf->total_stencil_bit_depths >
-                           0) ? conf->total_stencil_bit_depths : 1);
+                         stencil < ((conf->total_stencil_bit_depths > 0) ?
+                                    conf->
+                                    total_stencil_bit_depths : 1);
                          ++stencil) {
                         for (color = 0; color < conf->total_color_buffers;
                              ++color) {
                             for (accum = 0;
-                                 accum <
-                                 ((conf->total_accum_buffers >
-                                   0) ? conf->total_accum_buffers : 1);
+                                 accum < ((conf->total_accum_buffers > 0) ?
+                                          conf->
+                                          total_accum_buffers : 1);
                                  ++accum) {
                                 for (depth = 0;
                                      depth < conf->total_depth_buffer_depths;
@@ -159,7 +160,7 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
 
                                         c->level = 0;
                                         c->indexBits = 0;
-                                        c->pixmapMode = 0;      // TODO: What should this be?
+                                        c->pixmapMode = 0; // TODO: What should this be?
 
                                         if (conf->accelerated) {
                                             c->visualRating = GLX_NONE;
@@ -178,7 +179,8 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
 
                                         c->visualSelectGroup = 0;
 
-                                        c->swapMethod = GLX_SWAP_UNDEFINED_OML;
+                                        c->swapMethod =
+                                            GLX_SWAP_UNDEFINED_OML;
 
                                         // Stereo
                                         c->stereoMode = stereo ? TRUE : FALSE;
@@ -192,10 +194,11 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
                                             buffers ? TRUE : FALSE;
 
                                         // Stencil Buffer
-                                        if (conf->total_stencil_bit_depths > 0) {
+                                        if (conf->total_stencil_bit_depths >
+                                            0) {
                                             c->stencilBits =
-                                                conf->
-                                                stencil_bit_depths[stencil];
+                                                conf->stencil_bit_depths[
+                                                    stencil];
                                         }
                                         else {
                                             c->stencilBits = 0;
@@ -217,22 +220,27 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
                                         c->blueBits =
                                             conf->color_buffers[color].b;
 
-                                        c->rgbBits =
-                                            c->alphaBits + c->redBits +
-                                            c->greenBits + c->blueBits;
+                                        c->rgbBits = c->alphaBits +
+                                                     c->redBits +
+                                                     c->greenBits +
+                                                     c->blueBits;
 
                                         c->alphaMask =
                                             AM_ARGB(c->alphaBits, c->redBits,
-                                                    c->greenBits, c->blueBits);
+                                                    c->greenBits,
+                                                    c->blueBits);
                                         c->redMask =
                                             RM_ARGB(c->alphaBits, c->redBits,
-                                                    c->greenBits, c->blueBits);
+                                                    c->greenBits,
+                                                    c->blueBits);
                                         c->greenMask =
                                             GM_ARGB(c->alphaBits, c->redBits,
-                                                    c->greenBits, c->blueBits);
+                                                    c->greenBits,
+                                                    c->blueBits);
                                         c->blueMask =
                                             BM_ARGB(c->alphaBits, c->redBits,
-                                                    c->greenBits, c->blueBits);
+                                                    c->greenBits,
+                                                    c->blueBits);
 
                                         // Accumulation Buffers
                                         if (conf->total_accum_buffers > 0) {
@@ -242,12 +250,14 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
                                                 conf->accum_buffers[accum].g;
                                             c->accumBlueBits =
                                                 conf->accum_buffers[accum].b;
-                                            if (GLCAPS_COLOR_BUF_INVALID_VALUE
+                                            if (
+                                                GLCAPS_COLOR_BUF_INVALID_VALUE
                                                 !=
-                                                conf->accum_buffers[accum].a) {
+                                                conf->accum_buffers[accum].a)
+                                            {
                                                 c->accumAlphaBits =
-                                                    conf->accum_buffers[accum].
-                                                    a;
+                                                    conf->accum_buffers[accum
+                                                    ].a;
                                             }
                                             else {
                                                 c->accumAlphaBits = 0;
@@ -276,33 +286,33 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
                                             c->sampleBuffers = 0;
                                         }
 
-                                        /* 
-                                         * The Apple libGL supports GLXPixmaps and 
+                                        /*
+                                         * The Apple libGL supports GLXPixmaps and
                                          * GLXPbuffers in direct mode.
                                          */
                                         /* SGIX_fbconfig / GLX 1.3 */
-                                        c->drawableType =
-                                            GLX_WINDOW_BIT | GLX_PIXMAP_BIT |
-                                            GLX_PBUFFER_BIT;
+                                        c->drawableType = GLX_WINDOW_BIT |
+                                                          GLX_PIXMAP_BIT |
+                                                          GLX_PBUFFER_BIT;
                                         c->renderType = GLX_RGBA_BIT;
                                         c->xRenderable = GL_TRUE;
                                         c->fbconfigID = -1;
 
                                         /* SGIX_pbuffer / GLX 1.3 */
 
-                                        /* 
+                                        /*
                                          * The CGL layer provides a way of retrieving
                                          * the maximum pbuffer width/height, but only
                                          * if we create a context and call glGetIntegerv.
-                                         * 
+                                         *
                                          * The following values are from a test program
                                          * that does so.
                                          */
                                         c->maxPbufferWidth = 8192;
                                         c->maxPbufferHeight = 8192;
                                         c->maxPbufferPixels =
-                                            /*Do we need this? */ 0;
-                                        /* 
+                                            /*Do we need this?*/ 0;
+                                        /*
                                          * There is no introspection for this sort of thing
                                          * with CGL.  What should we do realistically?
                                          */
@@ -330,9 +340,9 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
     (c - 1)->next = NULL;
 
     if (c - visualConfigs != numConfigs) {
-        FatalError
-            ("numConfigs calculation error in setVisualConfigs!  numConfigs is %d  i is %d\n",
-             numConfigs, (int) (c - visualConfigs));
+        FatalError(
+            "numConfigs calculation error in setVisualConfigs!  numConfigs is %d  i is %d\n",
+            numConfigs, (int)(c - visualConfigs));
     }
 
     freeGlCapabilities(&caps);
diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.h b/xorg-server/hw/xquartz/GL/visualConfigs.h
index 2e1a1b3fd..889cdb904 100644
--- a/xorg-server/hw/xquartz/GL/visualConfigs.h
+++ b/xorg-server/hw/xquartz/GL/visualConfigs.h
@@ -23,6 +23,7 @@
 #ifndef VISUAL_CONFIGS_H
 #define VISUAL_CONFIGS_H
 
-__GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber);
+__GLXconfig *
+__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber);
 
 #endif
diff --git a/xorg-server/hw/xquartz/X11Application.h b/xorg-server/hw/xquartz/X11Application.h
index bdbe6ac1f..87cba6dec 100644
--- a/xorg-server/hw/xquartz/X11Application.h
+++ b/xorg-server/hw/xquartz/X11Application.h
@@ -1,31 +1,32 @@
 /* X11Application.h -- subclass of NSApplication to multiplex events
-
-   Copyright (c) 2002-2007 Apple 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef X11APPLICATION_H
 #define X11APPLICATION_H 1
@@ -34,57 +35,37 @@
 
 #import "X11Controller.h"
 
- @ interface X11Application:NSApplication {
+@interface X11Application : NSApplication {
     X11Controller *_controller;
 
-    unsigned int _x_active:1;
+    unsigned int _x_active : 1;
 }
 
- -(void) set_controller:controller;
- -(void) set_window_menu:(NSArray *) list;
-
- -(CFPropertyListRef) prefs_get_copy:(NSString *)
-key CF_RETURNS_RETAINED;
-
- -(int) prefs_get_integer:(NSString *)
-key default:(int) def;
-
- -(const char *) prefs_get_string:(NSString *)
-key default:(const char *) def;
-
- -(float) prefs_get_float:(NSString *)
-key default:(float) def;
-
- -(int) prefs_get_boolean:(NSString *)
-key default:(int) def;
-
- -(NSURL *) prefs_copy_url:(NSString *)
-key default:(NSURL *)
-def NS_RETURNS_RETAINED;
+- (void)set_controller:controller;
+- (void)set_window_menu:(NSArray *)list;
 
- -(NSArray *) prefs_get_array:(NSString *) key;
- -(void) prefs_set_integer:(NSString *)
-key value:(int) value;
+- (CFPropertyListRef)prefs_get_copy:(NSString *)key CF_RETURNS_RETAINED;
+- (int)prefs_get_integer:(NSString *)key default:(int)def;
+- (const char *)prefs_get_string:(NSString *)key default:(const char *)def;
+- (float)prefs_get_float:(NSString *)key default:(float)def;
+- (int)prefs_get_boolean:(NSString *)key default:(int)def;
+- (NSURL *)prefs_copy_url:(NSString *)key default:(NSURL *)def
+   NS_RETURNS_RETAINED;
+- (NSArray *)prefs_get_array:(NSString *)key;
+- (void)prefs_set_integer:(NSString *)key value:(int)value;
+- (void)prefs_set_float:(NSString *)key value:(float)value;
+- (void)prefs_set_boolean:(NSString *)key value:(int)value;
+- (void)prefs_set_array:(NSString *)key value:(NSArray *)value;
+- (void)prefs_set_string:(NSString *)key value:(NSString *)value;
+- (void)prefs_synchronize;
 
- -(void) prefs_set_float:(NSString *)
-key value:(float) value;
+- (X11Controller *)controller;
+- (OSX_BOOL)x_active;
+@end
 
- -(void) prefs_set_boolean:(NSString *)
-key value:(int) value;
+extern X11Application * X11App;
 
- -(void) prefs_set_array:(NSString *)
-key value:(NSArray *) value;
-
- -(void) prefs_set_string:(NSString *)
-key value:(NSString *) value;
-
--(void) prefs_synchronize;
-
--(X11Controller *) controller;
--(OSX_BOOL) x_active;
-@end extern X11Application *X11App;
-
-#endif                          /* __OBJC__ */
+#endif /* __OBJC__ */
 
 void
 X11ApplicationSetWindowMenu(int nitems, const char **items,
@@ -106,33 +87,37 @@ Bool
 X11ApplicationCanEnterRandR(void);
 
 void
+X11ApplicationFatalError(const char *f, va_list args) __printflike(1, 0);
+
+void
 X11ApplicationMain(int argc, char **argv, char **envp);
 
-#define PREFS_APPSMENU              "apps_menu"
-#define PREFS_FAKEBUTTONS           "enable_fake_buttons"
-#define PREFS_KEYEQUIVS             "enable_key_equivalents"
-#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"
-#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"
-#define PREFS_SYNC_KEYMAP           "sync_keymap"
-#define PREFS_DEPTH                 "depth"
-#define PREFS_NO_AUTH               "no_auth"
-#define PREFS_NO_TCP                "nolisten_tcp"
-#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"
-#define PREFS_NO_QUIT_ALERT         "no_quit_alert"
-#define PREFS_NO_RANDR_ALERT        "no_randr_alert"
-#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"
-#define PREFS_FAKE_BUTTON2          "fake_button2"
-#define PREFS_FAKE_BUTTON3          "fake_button3"
-#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"
-#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
-#define PREFS_ROOTLESS              "rootless"
-#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"
-#define PREFS_XP_OPTIONS            "xp_options"
-#define PREFS_LOGIN_SHELL           "login_shell"
-#define PREFS_UPDATE_FEED           "update_feed"
-#define PREFS_CLICK_THROUGH         "wm_click_through"
-#define PREFS_FFM                   "wm_ffm"
-#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"
+#define PREFS_APPSMENU                "apps_menu"
+#define PREFS_FAKEBUTTONS             "enable_fake_buttons"
+#define PREFS_KEYEQUIVS               "enable_key_equivalents"
+#define PREFS_FULLSCREEN_HOTKEYS      "fullscreen_hotkeys"
+#define PREFS_FULLSCREEN_MENU         "fullscreen_menu"
+#define PREFS_SYNC_KEYMAP             "sync_keymap"
+#define PREFS_DEPTH                   "depth"
+#define PREFS_NO_AUTH                 "no_auth"
+#define PREFS_NO_TCP                  "nolisten_tcp"
+#define PREFS_DONE_XINIT_CHECK        "done_xinit_check"
+#define PREFS_NO_QUIT_ALERT           "no_quit_alert"
+#define PREFS_NO_RANDR_ALERT          "no_randr_alert"
+#define PREFS_OPTION_SENDS_ALT        "option_sends_alt"
+#define PREFS_FAKE_BUTTON2            "fake_button2"
+#define PREFS_FAKE_BUTTON3            "fake_button3"
+#define PREFS_APPKIT_MODIFIERS        "appkit_modifiers"
+#define PREFS_WINDOW_ITEM_MODIFIERS   "window_item_modifiers"
+#define PREFS_ROOTLESS                "rootless"
+#define PREFS_RENDER_EXTENSION        "enable_render_extension"
+#define PREFS_TEST_EXTENSIONS         "enable_test_extensions"
+#define PREFS_XP_OPTIONS              "xp_options"
+#define PREFS_LOGIN_SHELL             "login_shell"
+#define PREFS_UPDATE_FEED             "update_feed"
+#define PREFS_CLICK_THROUGH           "wm_click_through"
+#define PREFS_FFM                     "wm_ffm"
+#define PREFS_FOCUS_ON_NEW_WINDOW     "wm_focus_on_new_window"
 
 #define PREFS_SCROLL_IN_DEV_DIRECTION "scroll_in_device_direction"
 extern Bool XQuartzScrollInDeviceDirection;
@@ -143,4 +128,4 @@ extern Bool XQuartzScrollInDeviceDirection;
 #define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"
 #define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"
 
-#endif                          /* X11APPLICATION_H */
+#endif /* X11APPLICATION_H */
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index e091fbb3d..a203f7807 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1,31 +1,32 @@
 /* X11Application.m -- subclass of NSApplication to multiplex events
- 
- Copyright (c) 2002-2008 Apple Inc.
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- 
- The above copyright notice and this permission notice 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 ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #include "sanitizedCarbon.h"
 
@@ -54,9 +55,10 @@
 #include <Xplugin.h>
 
 // pbproxy/pbproxy.h
-extern int xpbproxy_run(void);
+extern int
+xpbproxy_run(void);
 
-#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"
+#define DEFAULTS_FILE X11LIBDIR "/X11/xserver/Xquartz.plist"
 
 #ifndef XSERVER_VERSION
 #define XSERVER_VERSION "?"
@@ -69,6 +71,8 @@ static dispatch_queue_t eventTranslationQueue;
 #endif
 
 extern Bool noTestExtensions;
+extern Bool noRenderExtension;
+extern BOOL serverRunning;
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 static TISInputSourceRef last_key_layout;
@@ -93,23 +97,23 @@ X11Application *X11App;
 
 CFStringRef app_prefs_domain_cfstr = NULL;
 
-#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)
+#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | \
+                       NSAlternateKeyMask | NSCommandKeyMask)
+
+@interface X11Application (Private)
+- (void) sendX11NSEvent:(NSEvent *)e;
+@end
+
+@implementation X11Application
 
-@interface X11Application(Private)
- - (void) sendX11NSEvent:(NSEvent *) e;
-@end @ implementation X11Application typedef struct message_struct
-    message;
+typedef struct message_struct message;
 struct message_struct {
-    mach_msg_header_t
-        hdr;
-    SEL
-        selector;
-    NSObject *
-        arg;
+    mach_msg_header_t hdr;
+    SEL selector;
+    NSObject *arg;
 };
 
-static mach_port_t
-    _port;
+static mach_port_t _port;
 
 /* Quartz mode initialization routine. This is often dynamically loaded
    but is statically linked into this X server. */
@@ -122,20 +126,19 @@ init_ports(void)
     kern_return_t r;
     NSPort *p;
 
-    if (_port != MACH_PORT_NULL)
-        return;
+    if (_port != MACH_PORT_NULL) return;
 
     r = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &_port);
-    if (r != KERN_SUCCESS)
-        return;
+    if (r != KERN_SUCCESS) return;
 
- p =[NSMachPort portWithMachPort:_port];
- [p setDelegate:NSApp];
- [p scheduleInRunLoop: [NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+    p = [NSMachPort portWithMachPort:_port];
+    [p setDelegate:NSApp];
+    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:
+     NSDefaultRunLoopMode];
 }
 
 static void
-message_kit_thread(SEL selector, NSObject * arg)
+message_kit_thread(SEL selector, NSObject *arg)
 {
     message msg;
     kern_return_t r;
@@ -148,7 +151,7 @@ message_kit_thread(SEL selector, NSObject * arg)
     msg.hdr.msgh_id = 0;
 
     msg.selector = selector;
-    msg.arg =[arg retain];
+    msg.arg = [arg retain];
 
     r = mach_msg(&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
                  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
@@ -156,21 +159,22 @@ message_kit_thread(SEL selector, NSObject * arg)
         ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);
 }
 
- -(void) handleMachMessage:(void *) _msg {
+- (void) handleMachMessage:(void *)_msg
+{
     message *msg = _msg;
 
- [self performSelector: msg->selector withObject:msg->arg];
+    [self performSelector:msg->selector withObject:msg->arg];
     [msg->arg release];
 }
 
- -(void) set_controller:obj {
-    if (_controller == nil)
-        _controller =[obj retain];
+- (void) set_controller:obj
+{
+    if (_controller == nil) _controller = [obj retain];
 }
 
--(void) dealloc {
-    if (_controller != nil)
-        [_controller release];
+- (void) dealloc
+{
+    if (_controller != nil) [_controller release];
 
     if (_port != MACH_PORT_NULL)
         mach_port_deallocate(mach_task_self(), _port);
@@ -178,30 +182,32 @@ message_kit_thread(SEL selector, NSObject * arg)
     [super dealloc];
 }
 
- -(void) orderFrontStandardAboutPanel:(id) sender {
+- (void) orderFrontStandardAboutPanel: (id) sender
+{
     NSMutableDictionary *dict;
     NSDictionary *infoDict;
     NSString *tem;
 
- dict =[NSMutableDictionary dictionaryWithCapacity:3];
-    infoDict =[[NSBundle mainBundle] infoDictionary];
+    dict = [NSMutableDictionary dictionaryWithCapacity:3];
+    infoDict = [[NSBundle mainBundle] infoDictionary];
 
- [dict setObject:NSLocalizedString(@"The X Window System", @"About panel")
- forKey:@"ApplicationName"];
+    [dict setObject: NSLocalizedString(@"The X Window System", @"About panel")
+             forKey:@"ApplicationName"];
 
- tem =[infoDict objectForKey:@"CFBundleShortVersionString"];
+    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
 
- [dict setObject: [NSString stringWithFormat:@"XQuartz %@", tem]
- forKey:@"ApplicationVersion"];
+    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]
+             forKey:@"ApplicationVersion"];
 
- [dict setObject: [NSString stringWithFormat:@"xorg-server %s",
-     XSERVER_VERSION]
- forKey:@"Version"];
+    [dict setObject:[NSString stringWithFormat:@"xorg-server %s",
+                     XSERVER_VERSION]
+     forKey:@"Version"];
 
- [self orderFrontStandardAboutPanelWithOptions:dict];
+    [self orderFrontStandardAboutPanelWithOptions: dict];
 }
 
- -(void) activateX:(OSX_BOOL) state {
+- (void) activateX:(OSX_BOOL)state
+{
     if (_x_active == state)
         return;
 
@@ -210,7 +216,8 @@ message_kit_thread(SEL selector, NSObject * arg)
         if (bgMouseLocationUpdated) {
             DarwinSendPointerEvents(darwinPointer, MotionNotify, 0,
                                     bgMouseLocation.x, bgMouseLocation.y, 0.0,
-                                    0.0, 0.0);
+                                    0.0,
+                                    0.0);
             bgMouseLocationUpdated = FALSE;
         }
         DarwinSendDDXEvent(kXquartzActivate, 0);
@@ -232,11 +239,13 @@ message_kit_thread(SEL selector, NSObject * arg)
     _x_active = state;
 }
 
- -(void) became_key:(NSWindow *) win {
- [self activateX:NO];
+- (void) became_key:(NSWindow *)win
+{
+    [self activateX:NO];
 }
 
- -(void) sendEvent:(NSEvent *) e {
+- (void) sendEvent:(NSEvent *)e
+{
     OSX_BOOL for_appkit, for_x;
 
     /* By default pass down the responder chain and to X. */
@@ -253,8 +262,7 @@ message_kit_thread(SEL selector, NSObject * arg)
         if ([e window] != nil) {
             /* Pointer event has an (AppKit) window. Probably something for the kit. */
             for_x = NO;
-            if (_x_active)
- [self activateX:NO];
+            if (_x_active) [self activateX:NO];
         }
         else if ([self modalWindow] == nil) {
             /* Must be an X window. Tell appkit it doesn't have focus. */
@@ -263,27 +271,26 @@ message_kit_thread(SEL selector, NSObject * arg)
             if ([self isActive]) {
                 [self deactivate];
                 if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
- [self activateX:  YES];
+                    [self activateX:YES];
             }
         }
 
         /* We want to force sending to appkit if we're over the menu bar */
         if (!for_appkit) {
-            NSPoint NSlocation =[e locationInWindow];
-            NSWindow *window =[e window];
+            NSPoint NSlocation = [e locationInWindow];
+            NSWindow *window = [e window];
             NSRect NSframe, NSvisibleFrame;
             CGRect CGframe, CGvisibleFrame;
             CGPoint CGlocation;
 
             if (window != nil) {
-                NSRect frame =[window frame];
-
+                NSRect frame = [window frame];
                 NSlocation.x += frame.origin.x;
                 NSlocation.y += frame.origin.y;
             }
 
-            NSframe =[[NSScreen mainScreen] frame];
-            NSvisibleFrame =[[NSScreen mainScreen] visibleFrame];
+            NSframe = [[NSScreen mainScreen] frame];
+            NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];
 
             CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,
                                  NSframe.size.width, NSframe.size.height);
@@ -313,21 +320,21 @@ message_kit_thread(SEL selector, NSObject * arg)
 
                 if (darwinAppKitModMask &[e modifierFlags]) {
                     /* Override to force sending to Appkit */
-                    swallow_keycode =[e keyCode];
+                    swallow_keycode = [e keyCode];
                     do_swallow = YES;
                     for_x = NO;
 #if XPLUGIN_VERSION >= 1
                 }
                 else if (XQuartzEnableKeyEquivalents &&
                          xp_is_symbolic_hotkey_event([e eventRef])) {
-                    swallow_keycode =[e keyCode];
+                    swallow_keycode = [e keyCode];
                     do_swallow = YES;
                     for_x = NO;
 #endif
                 }
- else if (XQuartzEnableKeyEquivalents &&[[self mainMenu] performKeyEquivalent:e])
-                {
-                    swallow_keycode =[e keyCode];
+                else if (XQuartzEnableKeyEquivalents &&
+                         [[self mainMenu] performKeyEquivalent:e]) {
+                    swallow_keycode = [e keyCode];
                     do_swallow = YES;
                     for_appkit = NO;
                     for_x = NO;
@@ -335,11 +342,11 @@ message_kit_thread(SEL selector, NSObject * arg)
                 else if (!XQuartzIsRootless
                          && ([e modifierFlags] & ALL_KEY_MASKS) ==
                          (NSCommandKeyMask | NSAlternateKeyMask)
-                         && ([e keyCode] == 0 /*a */  ||
-                             [e keyCode] == 53 /*Esc */ )) {
-                    /* We have this here to force processing fullscreen 
+                         && ([e keyCode] == 0 /*a*/ || [e keyCode] ==
+                             53 /*Esc*/)) {
+                    /* We have this here to force processing fullscreen
                      * toggle even if XQuartzEnableKeyEquivalents is disabled */
-                    swallow_keycode =[e keyCode];
+                    swallow_keycode = [e keyCode];
                     do_swallow = YES;
                     for_x = NO;
                     for_appkit = NO;
@@ -350,16 +357,16 @@ message_kit_thread(SEL selector, NSObject * arg)
                     for_appkit = NO;
                 }
             }
-            else {              /* KeyUp */
+            else {       /* KeyUp */
                 /* If we saw a key equivalent on the down, don't pass
                  * the up through to X. */
-                if (do_swallow &&[e keyCode] == swallow_keycode) {
+                if (do_swallow && [e keyCode] == swallow_keycode) {
                     do_swallow = NO;
                     for_x = NO;
                 }
             }
         }
-        else {                  /* !_x_active */
+        else {       /* !_x_active */
             for_x = NO;
         }
         break;
@@ -378,7 +385,6 @@ message_kit_thread(SEL selector, NSObject * arg)
             for_x = NO;
             if ([e window] == nil && x_was_active) {
                 BOOL order_all_windows = YES, workspaces, ok;
-
                 for_appkit = NO;
 
                 /* FIXME: This is a hack to avoid passing the event to AppKit which
@@ -386,26 +392,26 @@ message_kit_thread(SEL selector, NSObject * arg)
                  */
                 _appFlags._active = YES;
 
- [self set_front_process:nil];
+                [self set_front_process:nil];
 
                 /* Get the Spaces preference for SwitchOnActivate */
-                (void) CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
+                (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
                 workspaces =
                     CFPreferencesGetAppBooleanValue(CFSTR("workspaces"),
-                                                    CFSTR("com.apple.dock"),
+                                                    CFSTR(
+                                                        "com.apple.dock"),
                                                     &ok);
                 if (!ok)
                     workspaces = NO;
 
                 if (workspaces) {
-                    (void)
-                        CFPreferencesAppSynchronize(CFSTR
-                                                    (".GlobalPreferences"));
+                    (void)CFPreferencesAppSynchronize(CFSTR(
+                                                          ".GlobalPreferences"));
                     order_all_windows =
-                        CFPreferencesGetAppBooleanValue(CFSTR
-                                                        ("AppleSpacesSwitchOnActivate"),
-                                                        CFSTR
-                                                        (".GlobalPreferences"),
+                        CFPreferencesGetAppBooleanValue(CFSTR(
+                                                            "AppleSpacesSwitchOnActivate"),
+                                                        CFSTR(
+                                                            ".GlobalPreferences"),
                                                         &ok);
                     if (!ok)
                         order_all_windows = YES;
@@ -418,16 +424,15 @@ message_kit_thread(SEL selector, NSObject * arg)
                  *       If there are no active windows, and there are minimized windows, we should
                  *       be restoring one of them.
                  */
-                if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
+                if ([e data2] & 0x10) {         // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
                     DarwinSendDDXEvent(kXquartzBringAllToFront, 1,
                                        order_all_windows);
                 }
             }
             break;
 
-        case 18:               /* ApplicationDidReactivate */
-            if (XQuartzFullscreenVisible)
-                for_appkit = NO;
+        case 18:         /* ApplicationDidReactivate */
+            if (XQuartzFullscreenVisible) for_appkit = NO;
             break;
 
         case NSApplicationDeactivatedEventType:
@@ -435,73 +440,80 @@ message_kit_thread(SEL selector, NSObject * arg)
 
             x_was_active = _x_active;
             if (_x_active)
- [self activateX:NO];
+                [self activateX:NO];
             break;
         }
         break;
 
     default:
-        break;                  /* for gcc */
+        break;          /* for gcc */
     }
 
-    if (for_appkit)
- [super sendEvent:e];
+    if (for_appkit) [super sendEvent:e];
 
     if (for_x) {
 #ifdef HAVE_LIBDISPATCH
-        dispatch_async(eventTranslationQueue, ^ {
-#endif
- [self sendX11NSEvent:e];
-#ifdef HAVE_LIBDISPATCH
-                       }
-        );
+        dispatch_async(eventTranslationQueue, ^{
+                           [self sendX11NSEvent:e];
+                       });
+#else
+        [self sendX11NSEvent:e];
 #endif
     }
 }
 
- -(void) set_window_menu:(NSArray *) list {
- [_controller set_window_menu:list];
+- (void) set_window_menu:(NSArray *)list
+{
+    [_controller set_window_menu:list];
 }
 
- -(void) set_window_menu_check:(NSNumber *) n {
- [_controller set_window_menu_check:n];
+- (void) set_window_menu_check:(NSNumber *)n
+{
+    [_controller set_window_menu_check:n];
 }
 
- -(void) set_apps_menu:(NSArray *) list {
- [_controller set_apps_menu:list];
+- (void) set_apps_menu:(NSArray *)list
+{
+    [_controller set_apps_menu:list];
 }
 
- -(void) set_front_process:unused {
- [NSApp activateIgnoringOtherApps:YES];
+- (void) set_front_process:unused
+{
+    [NSApp activateIgnoringOtherApps:YES];
 
     if ([self modalWindow] == nil)
- [self activateX:YES];
+        [self activateX:YES];
 }
 
- -(void) set_can_quit:(NSNumber *) state {
- [_controller set_can_quit:[state boolValue]];
+- (void) set_can_quit:(NSNumber *)state
+{
+    [_controller set_can_quit:[state boolValue]];
 }
 
- -(void) server_ready:unused {
+- (void) server_ready:unused
+{
     [_controller server_ready];
 }
 
- -(void) show_hide_menubar:(NSNumber *) state {
+- (void) show_hide_menubar:(NSNumber *)state
+{
     /* Also shows/hides the dock */
     if ([state boolValue])
         SetSystemUIMode(kUIModeNormal, 0);
     else
-        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0);        // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
+        SetSystemUIMode(kUIModeAllHidden,
+                        XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0);                   // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
 }
 
- -(void) launch_client:(NSString *) cmd {
- (void)[_controller application: self openFile:cmd];
+- (void) launch_client:(NSString *)cmd
+{
+    (void)[_controller application:self openFile:cmd];
 }
 
 /* user preferences */
 
 /* Note that these functions only work for arrays whose elements
- can be toll-free-bridged between NS and CF worlds. */
+   can be toll-free-bridged between NS and CF worlds. */
 
 static const void *
 cfretain(CFAllocatorRef a, const void *b)
@@ -516,7 +528,7 @@ cfrelease(CFAllocatorRef a, const void *b)
 }
 
 static CFMutableArrayRef
-nsarray_to_cfarray(NSArray * in)
+nsarray_to_cfarray(NSArray *in)
 {
     CFMutableArrayRef out;
     CFArrayCallBacks cb;
@@ -529,16 +541,16 @@ nsarray_to_cfarray(NSArray * in)
     cb.retain = cfretain;
     cb.release = cfrelease;
 
-    count =[in count];
+    count = [in count];
     out = CFArrayCreateMutable(NULL, count, &cb);
 
     for (i = 0; i < count; i++) {
- ns =[in objectAtIndex:i];
+        ns = [in objectAtIndex:i];
 
- if ([ns isKindOfClass:[NSArray class]])
-            cf = (CFTypeRef) nsarray_to_cfarray((NSArray *) ns);
+        if ([ns isKindOfClass:[NSArray class]])
+            cf = (CFTypeRef)nsarray_to_cfarray((NSArray *)ns);
         else
-            cf = CFRetain((CFTypeRef) ns);
+            cf = CFRetain((CFTypeRef)ns);
 
         CFArrayAppendValue(out, cf);
         CFRelease(cf);
@@ -556,28 +568,29 @@ cfarray_to_nsarray(CFArrayRef in)
     int i, count;
 
     count = CFArrayGetCount(in);
- out =[[NSMutableArray alloc] initWithCapacity:count];
+    out = [[NSMutableArray alloc] initWithCapacity:count];
 
     for (i = 0; i < count; i++) {
         cf = CFArrayGetValueAtIndex(in, i);
 
         if (CFGetTypeID(cf) == CFArrayGetTypeID())
-            ns = cfarray_to_nsarray((CFArrayRef) cf);
+            ns = cfarray_to_nsarray((CFArrayRef)cf);
         else
-            ns =[(id) cf retain];
+            ns = [(id) cf retain];
 
- [out addObject:ns];
+        [out addObject:ns];
         [ns release];
     }
 
     return out;
 }
 
- -(CFPropertyListRef) prefs_get_copy:(NSString *) key {
+- (CFPropertyListRef) prefs_get_copy:(NSString *)key
+{
     CFPropertyListRef value;
 
-    value =
-        CFPreferencesCopyAppValue((CFStringRef) key, app_prefs_domain_cfstr);
+    value = CFPreferencesCopyAppValue((CFStringRef)key,
+                                      app_prefs_domain_cfstr);
 
     if (value == NULL) {
         static CFDictionaryRef defaults;
@@ -589,16 +602,16 @@ cfarray_to_nsarray(CFArrayRef in)
             SInt32 error_code;
 
             url = (CFURLCreateFromFileSystemRepresentation
-                   (NULL, (unsigned char *) DEFAULTS_FILE,
-                    strlen(DEFAULTS_FILE), false));
-            if (CFURLCreateDataAndPropertiesFromResource
-                (NULL, url, &data, NULL, NULL, &error_code)) {
-                defaults =
-                    (CFPropertyListCreateFromXMLData
-                     (NULL, data, kCFPropertyListMutableContainersAndLeaves,
-                      &error));
-                if (error != NULL)
-                    CFRelease(error);
+                       (NULL, (unsigned char *)DEFAULTS_FILE,
+                       strlen(DEFAULTS_FILE), false));
+            if (CFURLCreateDataAndPropertiesFromResource(NULL, url, &data,
+                                                         NULL, NULL,
+                                                         &error_code)) {
+                defaults = (CFPropertyListCreateFromXMLData
+                                (NULL, data,
+                                kCFPropertyListMutableContainersAndLeaves,
+                                &error));
+                if (error != NULL) CFRelease(error);
                 CFRelease(data);
             }
             CFRelease(url);
@@ -610,17 +623,20 @@ cfarray_to_nsarray(CFArrayRef in)
 
                 /* Localize the names in the default apps menu. */
 
- apps =[(NSDictionary *) defaults objectForKey:@PREFS_APPSMENU];
+                apps =
+                    [(NSDictionary *) defaults objectForKey:@PREFS_APPSMENU];
                 if (apps != nil) {
-                    count =[apps count];
+                    count = [apps count];
                     for (i = 0; i < count; i++) {
- elt =[apps objectAtIndex:i];
- if (elt != nil &&[elt isKindOfClass:[NSArray class]]) {
- name =[elt objectAtIndex: 0];
+                        elt = [apps objectAtIndex:i];
+                        if (elt != nil &&
+                            [elt isKindOfClass:[NSArray class]]) {
+                            name = [elt objectAtIndex:0];
                             if (name != nil) {
                                 nname = NSLocalizedString(name, nil);
                                 if (nname != nil && nname != name)
- [elt replaceObjectAtIndex: 0 withObject:nname];
+                                    [elt replaceObjectAtIndex:0 withObject:
+                                     nname];
                             }
                         }
                     }
@@ -628,22 +644,19 @@ cfarray_to_nsarray(CFArrayRef in)
             }
         }
 
-        if (defaults != NULL)
-            value = CFDictionaryGetValue(defaults, key);
-        if (value != NULL)
-            CFRetain(value);
+        if (defaults != NULL) value = CFDictionaryGetValue(defaults, key);
+        if (value != NULL) CFRetain(value);
     }
 
     return value;
 }
 
- -(int) prefs_get_integer:(NSString *)
-key default:(int) def
+- (int) prefs_get_integer:(NSString *)key default:(int)def
 {
     CFPropertyListRef value;
     int ret;
 
- value =[self prefs_get_copy:key];
+    value = [self prefs_get_copy:key];
 
     if (value != NULL && CFGetTypeID(value) == CFNumberGetTypeID())
         CFNumberGetValue(value, kCFNumberIntType, &ret);
@@ -652,80 +665,73 @@ key default:(int) def
     else
         ret = def;
 
-    if (value != NULL)
-        CFRelease(value);
+    if (value != NULL) CFRelease(value);
 
     return ret;
 }
 
- -(const char *) prefs_get_string:(NSString *)
-key default:(const char *) def
+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def
 {
     CFPropertyListRef value;
     const char *ret = NULL;
 
- value =[self prefs_get_copy:key];
+    value = [self prefs_get_copy:key];
 
     if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID()) {
-        NSString *s = (NSString *) value;
+        NSString *s = (NSString *)value;
 
-        ret =[s UTF8String];
+        ret = [s UTF8String];
     }
 
-    if (value != NULL)
-        CFRelease(value);
+    if (value != NULL) CFRelease(value);
 
     return ret != NULL ? ret : def;
 }
 
- -(NSURL *) prefs_copy_url:(NSString *)
-key default:(NSURL *) def
+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def
 {
     CFPropertyListRef value;
     NSURL *ret = NULL;
 
- value =[self prefs_get_copy:key];
+    value = [self prefs_get_copy:key];
 
     if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID()) {
-        NSString *s = (NSString *) value;
+        NSString *s = (NSString *)value;
 
- ret =[NSURL URLWithString:s];
+        ret = [NSURL URLWithString:s];
         [ret retain];
     }
 
-    if (value != NULL)
-        CFRelease(value);
+    if (value != NULL) CFRelease(value);
 
     return ret != NULL ? ret : def;
 }
 
- -(float) prefs_get_float:(NSString *)
-key default:(float) def
+- (float) prefs_get_float:(NSString *)key default:(float)def
 {
     CFPropertyListRef value;
     float ret = def;
 
- value =[self prefs_get_copy:key];
+    value = [self prefs_get_copy:key];
 
-    if (value != NULL && CFGetTypeID(value) == CFNumberGetTypeID()
+    if (value != NULL
+        && CFGetTypeID(value) == CFNumberGetTypeID()
         && CFNumberIsFloatType(value))
         CFNumberGetValue(value, kCFNumberFloatType, &ret);
     else if (value != NULL && CFGetTypeID(value) == CFStringGetTypeID())
         ret = CFStringGetDoubleValue(value);
 
-    if (value != NULL)
-        CFRelease(value);
+    if (value != NULL) CFRelease(value);
 
     return ret;
 }
 
- -(int) prefs_get_boolean:(NSString *)
-key default:(int) def
+- (int) prefs_get_boolean:(NSString *)key default:(int)def
 {
     CFPropertyListRef value;
     int ret = def;
 
- value =[self prefs_get_copy:key];
+    value = [self prefs_get_copy:key];
 
     if (value != NULL) {
         if (CFGetTypeID(value) == CFNumberGetTypeID())
@@ -733,8 +739,7 @@ key default:(int) def
         else if (CFGetTypeID(value) == CFBooleanGetTypeID())
             ret = CFBooleanGetValue(value);
         else if (CFGetTypeID(value) == CFStringGetTypeID()) {
-            const char *tem =[(NSString *) value UTF8String];
-
+            const char *tem = [(NSString *) value UTF8String];
             if (strcasecmp(tem, "true") == 0 || strcasecmp(tem, "yes") == 0)
                 ret = YES;
             else
@@ -746,15 +751,16 @@ key default:(int) def
     return ret;
 }
 
- -(NSArray *) prefs_get_array:(NSString *) key {
+- (NSArray *) prefs_get_array:(NSString *)key
+{
     NSArray *ret = nil;
     CFPropertyListRef value;
 
- value =[self prefs_get_copy:key];
+    value = [self prefs_get_copy:key];
 
     if (value != NULL) {
         if (CFGetTypeID(value) == CFArrayGetTypeID())
-            ret =[cfarray_to_nsarray(value) autorelease];
+            ret = [cfarray_to_nsarray (value)autorelease];
 
         CFRelease(value);
     }
@@ -762,161 +768,167 @@ key default:(int) def
     return ret;
 }
 
- -(void) prefs_set_integer:(NSString *)
-key value:(int) value
+- (void) prefs_set_integer:(NSString *)key value:(int)value
 {
     CFNumberRef x;
 
     x = CFNumberCreate(NULL, kCFNumberIntType, &value);
 
-    CFPreferencesSetValue((CFStringRef) key, (CFTypeRef) x,
-                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+    CFPreferencesSetValue((CFStringRef)key, (CFTypeRef)x,
+                          app_prefs_domain_cfstr,
+                          kCFPreferencesCurrentUser,
                           kCFPreferencesAnyHost);
 
     CFRelease(x);
 }
 
- -(void) prefs_set_float:(NSString *)
-key value:(float) value
+- (void) prefs_set_float:(NSString *)key value:(float)value
 {
     CFNumberRef x;
 
     x = CFNumberCreate(NULL, kCFNumberFloatType, &value);
 
-    CFPreferencesSetValue((CFStringRef) key, (CFTypeRef) x,
-                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+    CFPreferencesSetValue((CFStringRef)key, (CFTypeRef)x,
+                          app_prefs_domain_cfstr,
+                          kCFPreferencesCurrentUser,
                           kCFPreferencesAnyHost);
 
     CFRelease(x);
 }
 
- -(void) prefs_set_boolean:(NSString *)
-key value:(int) value
+- (void) prefs_set_boolean:(NSString *)key value:(int)value
 {
-    CFPreferencesSetValue((CFStringRef) key,
-                          (CFTypeRef) (value ? kCFBooleanTrue
-                                       : kCFBooleanFalse),
-                          app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
-                          kCFPreferencesAnyHost);
+    CFPreferencesSetValue(
+        (CFStringRef)key,
+        (CFTypeRef)(value ? kCFBooleanTrue
+                    : kCFBooleanFalse),
+        app_prefs_domain_cfstr,
+        kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
 
 }
 
- -(void) prefs_set_array:(NSString *)
-key value:(NSArray *) value
+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value
 {
     CFArrayRef cfarray;
 
     cfarray = nsarray_to_cfarray(value);
-    CFPreferencesSetValue((CFStringRef) key,
-                          (CFTypeRef) cfarray,
+    CFPreferencesSetValue((CFStringRef)key,
+                          (CFTypeRef)cfarray,
                           app_prefs_domain_cfstr,
                           kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
     CFRelease(cfarray);
 }
 
- -(void) prefs_set_string:(NSString *)
-key value:(NSString *) value
+- (void) prefs_set_string:(NSString *)key value:(NSString *)value
 {
-    CFPreferencesSetValue((CFStringRef) key, (CFTypeRef) value,
+    CFPreferencesSetValue((CFStringRef)key, (CFTypeRef)value,
                           app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
                           kCFPreferencesAnyHost);
 }
 
--(void) prefs_synchronize {
+- (void) prefs_synchronize
+{
     CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
 }
 
--(void) read_defaults {
+- (void) read_defaults
+{
     NSString *nsstr;
     const char *tem;
 
-XQuartzRootlessDefault =[self prefs_get_boolean: @PREFS_ROOTLESS default:
-XQuartzRootlessDefault];
-XQuartzFullscreenMenu =[self prefs_get_boolean: @PREFS_FULLSCREEN_MENU default:
-XQuartzFullscreenMenu];
-XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean: @PREFS_FULLSCREEN_HOTKEYS default:
-!XQuartzFullscreenDisableHotkeys];
-darwinFakeButtons =[self prefs_get_boolean: @PREFS_FAKEBUTTONS default:
-darwinFakeButtons];
-XQuartzOptionSendsAlt =[self prefs_get_boolean: @PREFS_OPTION_SENDS_ALT default:
-XQuartzOptionSendsAlt];
+    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS
+                              default               :XQuartzRootlessDefault];
+    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU
+                             default               :XQuartzFullscreenMenu];
+    XQuartzFullscreenDisableHotkeys =
+        ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS
+          default               :!
+          XQuartzFullscreenDisableHotkeys];
+    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
+                         default               :darwinFakeButtons];
+    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT
+                             default               :XQuartzOptionSendsAlt];
 
     if (darwinFakeButtons) {
         const char *fake2, *fake3;
 
-fake2 =[self prefs_get_string: @PREFS_FAKE_BUTTON2 default:
-NULL];
-fake3 =[self prefs_get_string: @PREFS_FAKE_BUTTON3 default:
-NULL];
+        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];
+        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];
 
-        if (fake2 != NULL)
-            darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);
-        if (fake3 != NULL)
-            darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);
+        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(
+                fake2, TRUE);
+        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(
+                fake3, TRUE);
     }
 
-tem =[self prefs_get_string: @PREFS_APPKIT_MODIFIERS default:
-NULL];
-    if (tem != NULL)
-        darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
+    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];
+    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
 
-tem =[self prefs_get_string: @PREFS_WINDOW_ITEM_MODIFIERS default:
-NULL];
+    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];
     if (tem != NULL) {
         windowItemModMask = DarwinParseModifierList(tem, FALSE);
     }
     else {
-        nsstr =
-            NSLocalizedString(@"window item modifiers",
-                              @"window item modifiers");
+        nsstr = NSLocalizedString(@"window item modifiers",
+                                  @"window item modifiers");
         if (nsstr != NULL) {
-            tem =[nsstr UTF8String];
+            tem = [nsstr UTF8String];
             if ((tem != NULL) && strcmp(tem, "window item modifiers")) {
                 windowItemModMask = DarwinParseModifierList(tem, FALSE);
             }
         }
     }
 
-XQuartzEnableKeyEquivalents =[self prefs_get_boolean: @PREFS_KEYEQUIVS default:
-XQuartzEnableKeyEquivalents];
+    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
+                                   default               :
+                                   XQuartzEnableKeyEquivalents];
 
-darwinSyncKeymap =[self prefs_get_boolean: @PREFS_SYNC_KEYMAP default:
-darwinSyncKeymap];
+    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP
+                        default               :darwinSyncKeymap];
 
-darwinDesiredDepth =[self prefs_get_integer: @PREFS_DEPTH default:
-darwinDesiredDepth];
+    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
+                          default               :darwinDesiredDepth];
 
-noTestExtensions = ![self prefs_get_boolean: @PREFS_TEST_EXTENSIONS default:
-FALSE];
+    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS
+                         default               :FALSE];
 
-XQuartzScrollInDeviceDirection =[self prefs_get_boolean: @PREFS_SCROLL_IN_DEV_DIRECTION default:
-XQuartzScrollInDeviceDirection];
+    noRenderExtension = ![self prefs_get_boolean:@PREFS_RENDER_EXTENSION
+                          default               :TRUE];
 
-#if XQUARTZ_SPARKLE
-NSURL *url =[self prefs_copy_url: @PREFS_UPDATE_FEED default:
-nil];
+    XQuartzScrollInDeviceDirection =
+        [self prefs_get_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION
+         default               :
+         XQuartzScrollInDeviceDirection];
 
+#if XQUARTZ_SPARKLE
+    NSURL *url = [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
     if (url) {
- [[SUUpdater sharedUpdater] setFeedURL:url];
+        [[SUUpdater sharedUpdater] setFeedURL:url];
         [url release];
     }
 #endif
 }
 
 /* This will end up at the end of the responder chain. */
- -(void) copy:sender {
-    DarwinSendDDXEvent(kXquartzPasteboardNotify, 1, AppleWMCopyToPasteboard);
+- (void) copy:sender
+{
+    DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,
+                       AppleWMCopyToPasteboard);
 }
 
--(X11Controller *) controller {
+- (X11Controller *) controller
+{
     return _controller;
 }
 
--(OSX_BOOL) x_active {
+- (OSX_BOOL) x_active
+{
     return _x_active;
 }
 
-@end static NSArray *
+@end
+
+static NSArray *
 array_with_strings_and_numbers(int nitems, const char **items,
                                const char *numbers)
 {
@@ -926,24 +938,24 @@ array_with_strings_and_numbers(int nitems, const char **items,
 
     /* (Can't autorelease on the X server thread) */
 
- array =[[NSMutableArray alloc] initWithCapacity:nitems];
+    array = [[NSMutableArray alloc] initWithCapacity:nitems];
 
     for (i = 0; i < nitems; i++) {
- subarray =[[NSMutableArray alloc] initWithCapacity:2];
+        subarray = [[NSMutableArray alloc] initWithCapacity:2];
 
- string =[[NSString alloc] initWithUTF8String:items[i]];
- [subarray addObject:string];
+        string = [[NSString alloc] initWithUTF8String:items[i]];
+        [subarray addObject:string];
         [string release];
 
         if (numbers[i] != 0) {
- number =[[NSString alloc] initWithFormat:@"%d", numbers[i]];
- [subarray addObject:number];
+            number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];
+            [subarray addObject:number];
             [number release];
         }
         else
- [subarray addObject:@""];
+            [subarray addObject:@""];
 
- [array addObject:subarray];
+        [array addObject:subarray];
         [subarray release];
     }
 
@@ -955,12 +967,11 @@ X11ApplicationSetWindowMenu(int nitems, const char **items,
                             const char *shortcuts)
 {
     NSArray *array;
-
     array = array_with_strings_and_numbers(nitems, items, shortcuts);
 
     /* Send the array of strings over to the appkit thread */
 
- message_kit_thread(@selector(set_window_menu:), array);
+    message_kit_thread(@selector (set_window_menu:), array);
     [array release];
 }
 
@@ -969,9 +980,9 @@ X11ApplicationSetWindowMenuCheck(int idx)
 {
     NSNumber *n;
 
- n =[[NSNumber alloc] initWithInt:idx];
+    n = [[NSNumber alloc] initWithInt:idx];
 
- message_kit_thread(@selector(set_window_menu_check:), n);
+    message_kit_thread(@selector (set_window_menu_check:), n);
 
     [n release];
 }
@@ -979,7 +990,7 @@ X11ApplicationSetWindowMenuCheck(int idx)
 void
 X11ApplicationSetFrontProcess(void)
 {
- message_kit_thread(@selector(set_front_process:), nil);
+    message_kit_thread(@selector (set_front_process:), nil);
 }
 
 void
@@ -987,9 +998,9 @@ X11ApplicationSetCanQuit(int state)
 {
     NSNumber *n;
 
- n =[[NSNumber alloc] initWithBool:state];
+    n = [[NSNumber alloc] initWithBool:state];
 
- message_kit_thread(@selector(set_can_quit:), n);
+    message_kit_thread(@selector (set_can_quit:), n);
 
     [n release];
 }
@@ -997,7 +1008,7 @@ X11ApplicationSetCanQuit(int state)
 void
 X11ApplicationServerReady(void)
 {
- message_kit_thread(@selector(server_ready:), nil);
+    message_kit_thread(@selector (server_ready:), nil);
 }
 
 void
@@ -1005,9 +1016,9 @@ X11ApplicationShowHideMenubar(int state)
 {
     NSNumber *n;
 
- n =[[NSNumber alloc] initWithBool:state];
+    n = [[NSNumber alloc] initWithBool:state];
 
- message_kit_thread(@selector(show_hide_menubar:), n);
+    message_kit_thread(@selector (show_hide_menubar:), n);
 
     [n release];
 }
@@ -1017,9 +1028,9 @@ X11ApplicationLaunchClient(const char *cmd)
 {
     NSString *string;
 
- string =[[NSString alloc] initWithUTF8String:cmd];
+    string = [[NSString alloc] initWithUTF8String:cmd];
 
- message_kit_thread(@selector(launch_client:), string);
+    message_kit_thread(@selector (launch_client:), string);
 
     [string release];
 }
@@ -1033,28 +1044,29 @@ X11ApplicationCanEnterRandR(void)
 {
     NSString *title, *msg;
 
-if ([X11App prefs_get_boolean: @PREFS_NO_RANDR_ALERT default:
-NO] || XQuartzShieldingWindowLevel != 0)
+    if ([X11App prefs_get_boolean:@PREFS_NO_RANDR_ALERT default:NO] ||
+        XQuartzShieldingWindowLevel != 0)
         return TRUE;
 
-    title =
-        NSLocalizedString(@"Enter RandR mode?",
-                          @"Dialog title when switching to RandR");
-    msg =
-        NSLocalizedString
-        (@"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",
-         @"Dialog when switching to RandR");
+    title = NSLocalizedString(@"Enter RandR mode?",
+                              @"Dialog title when switching to RandR");
+    msg = NSLocalizedString(
+        @"An application has requested X11 to change the resolution of your display.  X11 will restore the display to its previous state when the requesting application requests to return to the previous state.  Alternatively, you can use the ⌥⌘A key sequence to force X11 to return to the previous state.",
+        @"Dialog when switching to RandR");
 
     if (!XQuartzIsRootless)
         QuartzShowFullscreen(FALSE);
 
-    switch (NSRunAlertPanel
-            (title, msg, NSLocalizedString(@"Allow", @""),
-             NSLocalizedString(@"Cancel", @""),
-             NSLocalizedString(@"Always Allow", @""))) {
+    switch (NSRunAlertPanel(title, msg,
+                            NSLocalizedString(@"Allow",
+                                              @""),
+                            NSLocalizedString(@"Cancel",
+                                              @""),
+                            NSLocalizedString(@"Always Allow", @""))) {
     case NSAlertOtherReturn:
- [X11App prefs_set_boolean: @PREFS_NO_RANDR_ALERT value:YES];
+        [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];
         [X11App prefs_synchronize];
+
     case NSAlertDefaultReturn:
         return YES;
 
@@ -1063,33 +1075,82 @@ NO] || XQuartzShieldingWindowLevel != 0)
     }
 }
 
+void
+X11ApplicationFatalError(const char *f, va_list args)
+{
+#ifdef HAVE_LIBDISPATCH
+    NSString *title, *msg;
+    char *error_msg;
+
+    /* This is called by FatalError() in the server thread just before
+     * we would abort.  If the server never got off the ground, We should
+     * inform the user of the error rather than letting the ever-so-friendly
+     * CrashReporter do it for us.
+     *
+     * This also has the benefit of forcing user interaction rather than
+     * allowing an infinite throttled-restart if the crash occurs before
+     * we can drain the launchd socket.
+     */
+
+    if (serverRunning) {
+        return;
+    }
+
+    title = NSLocalizedString(@"The application X11 could not be opened.",
+                              @"Dialog title when encountering a fatal error");
+    msg = NSLocalizedString(
+        @"An error occurred while starting the X11 server: \"%s\"\n\nClick Quit to quit X11. Click Report to see more details or send a report to Apple.",
+        @"Dialog when encountering a fatal error");
+
+    vasprintf(&error_msg, f, args);
+    msg = [NSString stringWithFormat:msg, error_msg];
+
+    /* We want the AppKit thread to actually service the alert or we will race [NSApp run] and create an
+     * 'NSInternalInconsistencyException', reason: 'NSApp with wrong _running count'
+     */
+    dispatch_sync(dispatch_get_main_queue(), ^{
+                      if (NSAlertDefaultReturn ==
+                          NSRunAlertPanel (title, msg,
+                                           NSLocalizedString (@"Quit", @""),
+                                           NSLocalizedString (
+                                               @"Report...", @""), nil)) {
+                          exit (EXIT_FAILURE);
+                      }
+                  });
+
+    /* fall back to caller to do the abort() in the DIX */
+#endif
+}
+
 static void
 check_xinitrc(void)
 {
     char *tem, buf[1024];
     NSString *msg;
 
-if ([X11App prefs_get_boolean: @PREFS_DONE_XINIT_CHECK default:
-NO])
+    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])
         return;
 
     tem = getenv("HOME");
-    if (tem == NULL)
-        goto done;
+    if (tem == NULL) goto done;
 
     snprintf(buf, sizeof(buf), "%s/.xinitrc", tem);
     if (access(buf, F_OK) != 0)
         goto done;
 
-    msg = NSLocalizedString(@"You have an existing ~/.xinitrc file.\n\n\
-Windows displayed by X11 applications may not have titlebars, or may look \
-different to windows displayed by native applications.\n\n\
-Would you like to move aside the existing file and use the standard X11 \
-environment the next time you start X11?", @"Startup xinitrc dialog");
+    msg =
+        NSLocalizedString(
+            @"You have an existing ~/.xinitrc file.\n\n\
+                             Windows displayed by X11 applications may not have titlebars, or may look \
+                             different to windows displayed by native applications.\n\n\
+                             Would you like to move aside the existing file and use the standard X11 \
+                             environment the next time you start X11?"                                                                                                                                                                                                                                                                                                                                                                  ,
+            @"Startup xinitrc dialog");
 
     if (NSAlertDefaultReturn ==
         NSRunAlertPanel(nil, msg, NSLocalizedString(@"Yes", @""),
-                        NSLocalizedString(@"No", @""), nil)) {
+                        NSLocalizedString(@"No",
+                                          @""), nil)) {
         char buf2[1024];
         int i = -1;
 
@@ -1101,13 +1162,13 @@ environment the next time you start X11?", @"Startup xinitrc dialog");
         rename(buf, buf2);
     }
 
- done:
- [X11App prefs_set_boolean: @PREFS_DONE_XINIT_CHECK value:YES];
+done:
+    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];
     [X11App prefs_synchronize];
 }
 
 static inline pthread_t
-create_thread(void *(*func) (void *), void *arg)
+create_thread(void *(*func)(void *), void *arg)
 {
     pthread_attr_t attr;
     pthread_t tid;
@@ -1136,11 +1197,10 @@ X11ApplicationMain(int argc, char **argv, char **envp)
     NSAutoreleasePool *pool;
 
 #ifdef DEBUG
-    while (access("/tmp/x11-block", F_OK) == 0)
-        sleep(1);
+    while (access("/tmp/x11-block", F_OK) == 0) sleep(1);
 #endif
 
-    pool =[[NSAutoreleasePool alloc] init];
+    pool = [[NSAutoreleasePool alloc] init];
     X11App = (X11Application *)[X11Application sharedApplication];
     init_ports();
 
@@ -1148,15 +1208,17 @@ X11ApplicationMain(int argc, char **argv, char **envp)
         (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];
 
     if (app_prefs_domain_cfstr == NULL) {
-        ErrorF
-            ("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");
+        ErrorF(
+            "X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");
         app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX ".X11");
     }
 
     [NSApp read_defaults];
- [NSBundle loadNibNamed: @"main" owner:NSApp];
- [[NSNotificationCenter defaultCenter] addObserver: NSApp selector: @selector(became_key:)
- name: NSWindowDidBecomeKeyNotification object:nil];
+    [NSBundle loadNibNamed:@"main" owner:NSApp];
+    [[NSNotificationCenter defaultCenter] addObserver:NSApp
+                                             selector:@selector (became_key:)
+                                                 name:
+     NSWindowDidBecomeKeyNotification object:nil];
 
     /*
      * The xpr Quartz mode is statically linked into this server.
@@ -1166,12 +1228,11 @@ X11ApplicationMain(int argc, char **argv, char **envp)
 
     /* Calculate the height of the menubar so we can avoid it. */
     aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
-        NSMaxY([[NSScreen mainScreen] visibleFrame]);
+                        NSMaxY([[NSScreen mainScreen] visibleFrame]);
 
 #ifdef HAVE_LIBDISPATCH
-    eventTranslationQueue =
-        dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.NSEventsToX11EventsQueue",
-                              NULL);
+    eventTranslationQueue = dispatch_queue_create(
+        BUNDLE_ID_PREFIX ".X11.NSEventsToX11EventsQueue", NULL);
     assert(eventTranslationQueue != NULL);
 #endif
 
@@ -1180,13 +1241,13 @@ X11ApplicationMain(int argc, char **argv, char **envp)
     last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();
 
     if (!last_key_layout)
-        ErrorF
-            ("X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
+        ErrorF(
+            "X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
 #else
     KLGetCurrentKeyboardLayout(&last_key_layout);
     if (!last_key_layout)
-        ErrorF
-            ("X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
+        ErrorF(
+            "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
 #endif
 
     if (!QuartsResyncKeymap(FALSE)) {
@@ -1206,7 +1267,7 @@ X11ApplicationMain(int argc, char **argv, char **envp)
 #if XQUARTZ_SPARKLE
     [[X11App controller] setup_sparkle];
     [[SUUpdater sharedUpdater] resetUpdateCycle];
-//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];
+    //    [[SUUpdater sharedUpdater] checkForUpdates:X11App];
 #endif
 
     [pool release];
@@ -1214,7 +1275,8 @@ X11ApplicationMain(int argc, char **argv, char **envp)
     /* not reached */
 }
 
-@implementation X11Application(Private)
+@implementation X11Application (Private)
+
 #ifdef NX_DEVICELCMDKEYMASK
 /* This is to workaround a bug in the VNC server where we sometimes see the L
  * modifier and sometimes see no "side"
@@ -1223,7 +1285,8 @@ static inline int
 ensure_flag(int flags, int device_independent, int device_dependents,
             int device_dependent_default)
 {
-    if ((flags & device_independent) && !(flags & device_dependents))
+    if ((flags & device_independent) &&
+        !(flags & device_dependents))
         flags |= device_dependent_default;
     return flags;
 }
@@ -1231,27 +1294,35 @@ ensure_flag(int flags, int device_independent, int device_dependents,
 
 #ifdef DEBUG_UNTRUSTED_POINTER_DELTA
 static const char *
-untrusted_str(NSEvent * e)
+untrusted_str(NSEvent *e)
 {
     switch ([e type]) {
     case NSScrollWheel:
         return "NSScrollWheel";
+
     case NSTabletPoint:
         return "NSTabletPoint";
+
     case NSOtherMouseDown:
         return "NSOtherMouseDown";
+
     case NSOtherMouseUp:
         return "NSOtherMouseUp";
+
     case NSLeftMouseDown:
         return "NSLeftMouseDown";
+
     case NSLeftMouseUp:
         return "NSLeftMouseUp";
+
     default:
         switch ([e subtype]) {
         case NSTabletPointEventSubtype:
             return "NSTabletPointEventSubtype";
+
         case NSTabletProximityEventSubtype:
             return "NSTabletProximityEventSubtype";
+
         default:
             return "Other";
         }
@@ -1259,23 +1330,24 @@ untrusted_str(NSEvent * e)
 }
 #endif
 
- -(void) sendX11NSEvent:(NSEvent *) e {
+- (void) sendX11NSEvent:(NSEvent *)e
+{
     NSPoint location = NSZeroPoint;
     int ev_button, ev_type;
-    static float pressure = 0.0;        // static so ProximityOut will have the value from the previous tablet event
-    static NSPoint tilt;        // static so ProximityOut will have the value from the previous tablet event
+    static float pressure = 0.0;       // static so ProximityOut will have the value from the previous tablet event
+    static NSPoint tilt;               // static so ProximityOut will have the value from the previous tablet event
     static DeviceIntPtr darwinTabletCurrent = NULL;
-    static BOOL needsProximityIn = NO;  // Do we do need to handle a pending ProximityIn once we have pressure/tilt?
+    static BOOL needsProximityIn = NO; // Do we do need to handle a pending ProximityIn once we have pressure/tilt?
     DeviceIntPtr pDev;
     int modifierFlags;
     BOOL isMouseOrTabletEvent, isTabletEvent;
 
 #ifdef HAVE_LIBDISPATCH
     static dispatch_once_t once_pred;
-
-    dispatch_once(&once_pred, ^ {
-                  tilt = NSZeroPoint;
-                  darwinTabletCurrent = darwinTabletStylus;});
+    dispatch_once(&once_pred, ^{
+                      tilt = NSZeroPoint;
+                      darwinTabletCurrent = darwinTabletStylus;
+                  });
 #else
     if (!darwinTabletCurrent) {
         tilt = NSZeroPoint;
@@ -1283,23 +1355,28 @@ untrusted_str(NSEvent * e)
     }
 #endif
 
-    isMouseOrTabletEvent =[e type] == NSLeftMouseDown ||
-        [e type] == NSOtherMouseDown ||[e type] == NSRightMouseDown ||
-        [e type] == NSLeftMouseUp ||[e type] == NSOtherMouseUp ||
-        [e type] == NSRightMouseUp ||[e type] == NSLeftMouseDragged ||
-        [e type] == NSOtherMouseDragged ||[e type] == NSRightMouseDragged ||
-        [e type] == NSMouseMoved ||[e type] == NSTabletPoint ||
-        [e type] == NSScrollWheel;
+    isMouseOrTabletEvent = [e type] == NSLeftMouseDown ||
+                           [e type] == NSOtherMouseDown ||
+                           [e type] == NSRightMouseDown ||
+                           [e type] == NSLeftMouseUp ||
+                           [e type] == NSOtherMouseUp ||
+                           [e type] == NSRightMouseUp ||
+                           [e type] == NSLeftMouseDragged ||
+                           [e type] == NSOtherMouseDragged ||
+                           [e type] == NSRightMouseDragged ||
+                           [e type] == NSMouseMoved ||
+                           [e type] == NSTabletPoint || 
+                           [e type] == NSScrollWheel;
 
     isTabletEvent = ([e type] == NSTabletPoint) ||
-        (isMouseOrTabletEvent &&
-         ([e subtype] == NSTabletPointEventSubtype ||
-          [e subtype] == NSTabletProximityEventSubtype));
+                    (isMouseOrTabletEvent &&
+                     ([e subtype] == NSTabletPointEventSubtype ||
+                      [e subtype] == NSTabletProximityEventSubtype));
 
     if (isMouseOrTabletEvent) {
         static NSPoint lastpt;
-        NSWindow *window =[e window];
- NSRect screen =[[[NSScreen screens] objectAtIndex:0] frame];
+        NSWindow *window = [e window];
+        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];
         BOOL hasUntrustedPointerDelta;
 
         // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that
@@ -1312,23 +1389,21 @@ untrusted_str(NSEvent * e)
         // The deltaXY for middle click events also appear erroneous after fast user switching
         // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS
         // http://xquartz.macosforge.org/trac/ticket/389
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta ||
-            [e type] == NSOtherMouseDown ||[e type] == NSOtherMouseUp;
+        hasUntrustedPointerDelta |= [e type] == NSOtherMouseDown ||
+                                    [e type] == NSOtherMouseUp;
 
         // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta
         // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta ||
-            [e type] == NSScrollWheel;
+        hasUntrustedPointerDelta |= [e type] == NSScrollWheel;
 
 #ifdef DEBUG_UNTRUSTED_POINTER_DELTA
-        hasUntrustedPointerDelta = hasUntrustedPointerDelta ||
-            [e type] == NSLeftMouseDown ||[e type] == NSLeftMouseUp;
+        hasUntrustedPointerDelta |= [e type] == NSLeftMouseDown ||
+                                    [e type] == NSLeftMouseUp;
 #endif
 
         if (window != nil) {
-            NSRect frame =[window frame];
-
-            location =[e locationInWindow];
+            NSRect frame = [window frame];
+            location = [e locationInWindow];
             location.x += frame.origin.x;
             location.y += frame.origin.y;
             lastpt = location;
@@ -1338,53 +1413,49 @@ untrusted_str(NSEvent * e)
             ErrorF("--- Begin Event Debug ---\n");
             ErrorF("Event type: %s\n", untrusted_str(e));
             ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);
-            ErrorF("     delta: (%0.2f, %0.2f)\n",[e deltaX], -[e deltaY]);
-            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x +[e deltaX],
-                   lastpt.y -[e deltaY]);
-            ErrorF("workaround: (%0.2f, %0.2f)\n",[e locationInWindow].x,
+            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);
+            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX],
+                   lastpt.y - [e deltaY]);
+            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x,
                    [e locationInWindow].y);
             ErrorF("--- End Event Debug ---\n");
 
-            location.x = lastpt.x +[e deltaX];
-            location.y = lastpt.y -[e deltaY];
-            lastpt =[e locationInWindow];
+            location.x = lastpt.x + [e deltaX];
+            location.y = lastpt.y - [e deltaY];
+            lastpt = [e locationInWindow];
 #else
-            location =[e locationInWindow];
+            location = [e locationInWindow];
             lastpt = location;
 #endif
         }
         else {
-            location.x = lastpt.x +[e deltaX];
-            location.y = lastpt.y -[e deltaY];
-            lastpt =[e locationInWindow];
+            location.x = lastpt.x + [e deltaX];
+            location.y = lastpt.y - [e deltaY];
+            lastpt = [e locationInWindow];
         }
 
         /* Convert coordinate system */
         location.y = (screen.origin.y + screen.size.height) - location.y;
     }
 
-    modifierFlags =[e modifierFlags];
+    modifierFlags = [e modifierFlags];
 
 #ifdef NX_DEVICELCMDKEYMASK
     /* This is to workaround a bug in the VNC server where we sometimes see the L
      * modifier and sometimes see no "side"
      */
-    modifierFlags =
-        ensure_flag(modifierFlags, NX_CONTROLMASK,
-                    NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK,
-                    NX_DEVICELCTLKEYMASK);
-    modifierFlags =
-        ensure_flag(modifierFlags, NX_SHIFTMASK,
-                    NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,
-                    NX_DEVICELSHIFTKEYMASK);
-    modifierFlags =
-        ensure_flag(modifierFlags, NX_COMMANDMASK,
-                    NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK,
-                    NX_DEVICELCMDKEYMASK);
-    modifierFlags =
-        ensure_flag(modifierFlags, NX_ALTERNATEMASK,
-                    NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK,
-                    NX_DEVICELALTKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,
+                                NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK,
+                                NX_DEVICELCTLKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,
+                                NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK, 
+                                NX_DEVICELSHIFTKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,
+                                NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK,
+                                NX_DEVICELCMDKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK,
+                                NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK,
+                                NX_DEVICELALTKEYMASK);
 #endif
 
     modifierFlags &= darwin_all_modifier_mask;
@@ -1402,48 +1473,58 @@ untrusted_str(NSEvent * e)
         ev_button = 1;
         ev_type = ButtonPress;
         goto handle_mouse;
+
     case NSOtherMouseDown:
         ev_button = 2;
         ev_type = ButtonPress;
         goto handle_mouse;
+
     case NSRightMouseDown:
         ev_button = 3;
         ev_type = ButtonPress;
         goto handle_mouse;
+
     case NSLeftMouseUp:
         ev_button = 1;
         ev_type = ButtonRelease;
         goto handle_mouse;
+
     case NSOtherMouseUp:
         ev_button = 2;
         ev_type = ButtonRelease;
         goto handle_mouse;
+
     case NSRightMouseUp:
         ev_button = 3;
         ev_type = ButtonRelease;
         goto handle_mouse;
+
     case NSLeftMouseDragged:
         ev_button = 1;
         ev_type = MotionNotify;
         goto handle_mouse;
+
     case NSOtherMouseDragged:
         ev_button = 2;
         ev_type = MotionNotify;
         goto handle_mouse;
+
     case NSRightMouseDragged:
         ev_button = 3;
         ev_type = MotionNotify;
         goto handle_mouse;
+
     case NSMouseMoved:
         ev_button = 0;
         ev_type = MotionNotify;
         goto handle_mouse;
+
     case NSTabletPoint:
         ev_button = 0;
         ev_type = MotionNotify;
         goto handle_mouse;
 
- handle_mouse:
+handle_mouse:
         pDev = darwinPointer;
 
         /* NSTabletPoint can have no subtype */
@@ -1453,9 +1534,11 @@ untrusted_str(NSEvent * e)
             case NSEraserPointingDevice:
                 darwinTabletCurrent = darwinTabletEraser;
                 break;
+
             case NSPenPointingDevice:
                 darwinTabletCurrent = darwinTabletStylus;
                 break;
+
             case NSCursorPointingDevice:
             case NSUnknownPointingDevice:
             default:
@@ -1474,8 +1557,8 @@ untrusted_str(NSEvent * e)
 
         if ([e type] == NSTabletPoint ||
             [e subtype] == NSTabletPointEventSubtype) {
-            pressure =[e pressure];
-            tilt =[e tilt];
+            pressure = [e pressure];
+            tilt = [e tilt];
 
             pDev = darwinTabletCurrent;
 
@@ -1490,7 +1573,7 @@ untrusted_str(NSEvent * e)
 
         if (!XQuartzServerVisible && noTestExtensions) {
 #if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
-/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
+            /* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
             xp_window_id wid = 0;
             xp_error err;
 
@@ -1529,9 +1612,11 @@ untrusted_str(NSEvent * e)
         case NSEraserPointingDevice:
             darwinTabletCurrent = darwinTabletEraser;
             break;
+
         case NSPenPointingDevice:
             darwinTabletCurrent = darwinTabletStylus;
             break;
+
         case NSCursorPointingDevice:
         case NSUnknownPointingDevice:
         default:
@@ -1549,31 +1634,32 @@ untrusted_str(NSEvent * e)
 
     case NSScrollWheel:
     {
-        float deltaX =[e deltaX];
-        float deltaY =[e deltaY];
-
+        float deltaX = [e deltaX];
+        float deltaY = [e deltaY];
 #if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
         /* If we're in the background, we need to send a MotionNotify event
          * first, since we aren't getting them on background mouse motion
          */
         if (!XQuartzServerVisible && noTestExtensions) {
             bgMouseLocationUpdated = FALSE;
-            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,
-                                    location.y, pressure, tilt.x, tilt.y);
+            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0,
+                                    location.x, location.y, pressure, 
+                                    tilt.x, tilt.y);
         }
 #endif
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
         // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
-        if (NSAppKitVersionNumber >= 1117 && XQuartzScrollInDeviceDirection &&
+        if (NSAppKitVersionNumber >= 1117 &&
+            XQuartzScrollInDeviceDirection &&
             [e isDirectionInvertedFromDevice]) {
             deltaX *= -1;
             deltaY *= -1;
         }
 #endif
-        DarwinSendScrollEvents(deltaX, deltaY, location.x, location.y,
-                               pressure, tilt.x, tilt.y);
+        DarwinSendScrollEvents(deltaX, deltaY);
         break;
     }
+
     case NSKeyDown:
     case NSKeyUp:
     {
@@ -1581,7 +1667,6 @@ untrusted_str(NSEvent * e)
          * TODO: Make this less of a kludge.
          */
         static int force_resync_keymap = YES;
-
         if (force_resync_keymap) {
             DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
             force_resync_keymap = NO;
@@ -1590,10 +1675,9 @@ untrusted_str(NSEvent * e)
 
         if (darwinSyncKeymap) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-            TISInputSourceRef key_layout =
+            TISInputSourceRef key_layout = 
                 TISCopyCurrentKeyboardLayoutInputSource();
             TISInputSourceRef clear;
-
             if (CFEqual(key_layout, last_key_layout)) {
                 CFRelease(key_layout);
             }
@@ -1604,25 +1688,24 @@ untrusted_str(NSEvent * e)
                 CFRelease(clear);
 #else
             KeyboardLayoutRef key_layout;
-
             KLGetCurrentKeyboardLayout(&key_layout);
             if (key_layout != last_key_layout) {
                 last_key_layout = key_layout;
 #endif
                 /* Update keyInfo */
                 if (!QuartsResyncKeymap(TRUE)) {
-                    ErrorF("sendX11NSEvent: Could not build a valid keymap.\n");
+                    ErrorF(
+                        "sendX11NSEvent: Could not build a valid keymap.\n");
                 }
             }
         }
 
         ev_type = ([e type] == NSKeyDown) ? KeyPress : KeyRelease;
-        DarwinSendKeyboardEvents(ev_type,[e keyCode]);
+        DarwinSendKeyboardEvents(ev_type, [e keyCode]);
         break;
 
     default:
-        break;                  /* for gcc */
+        break;              /* for gcc */
     }
 }
-
 @end
diff --git a/xorg-server/hw/xquartz/X11Controller.h b/xorg-server/hw/xquartz/X11Controller.h
index e7fcd453f..1e6027006 100644
--- a/xorg-server/hw/xquartz/X11Controller.h
+++ b/xorg-server/hw/xquartz/X11Controller.h
@@ -1,31 +1,32 @@
 /* X11Controller.h -- connect the IB ui
-
-   Copyright (c) 2002 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef X11CONTROLLER_H
 #define X11CONTROLLER_H 1
@@ -55,9 +56,9 @@ typedef unsigned int NSUInteger;
 #endif
 #endif
 
- @interface X11Controller:NSObject
+@interface X11Controller : NSObject
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-    < NSTableViewDataSource >
+    <NSTableViewDataSource>
 #endif
 {
     IBOutlet NSPanel *prefs_panel;
@@ -85,7 +86,6 @@ typedef unsigned int NSUInteger;
     IBOutlet NSPopUpButton *depth;
 
     IBOutlet NSMenuItem *window_separator;
-
     // window_separator is DEPRECATED due to this radar:
     // <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
     // It is kept around for localization compatability and is subject to removal "eventually"
@@ -95,7 +95,6 @@ typedef unsigned int NSUInteger;
     IBOutlet NSMenuItem *dock_window_separator;
     IBOutlet NSMenuItem *apps_separator;
     IBOutlet NSMenuItem *toggle_fullscreen_item;
-
 #ifdef XQUARTZ_SPARKLE
     NSMenuItem *check_for_updates_item; // Programatically enabled
 #endif
@@ -118,40 +117,41 @@ typedef unsigned int NSUInteger;
     OSX_BOOL can_quit;
 }
 
- -(void) set_window_menu:(NSArray *) list;
- -(void) set_window_menu_check:(NSNumber *) n;
- -(void) set_apps_menu:(NSArray *) list;
+- (void)set_window_menu:(NSArray *)list;
+- (void)set_window_menu_check:(NSNumber *)n;
+- (void)set_apps_menu:(NSArray *)list;
 #ifdef XQUARTZ_SPARKLE
--(void) setup_sparkle;
- -(void) updater:(SUUpdater *)
-updater willInstallUpdate:(SUAppcastItem *) update;
+- (void)setup_sparkle;
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)
+   update;
 #endif
- -(void) set_can_quit:(OSX_BOOL) state;
--(void) server_ready;
- -(OSX_BOOL) application:(NSApplication *)
-app openFile:(NSString *) filename;
-
- -(IBAction) apps_table_show:(id) sender;
- -(IBAction) apps_table_done:(id) sender;
- -(IBAction) apps_table_new:(id) sender;
- -(IBAction) apps_table_duplicate:(id) sender;
- -(IBAction) apps_table_delete:(id) sender;
- -(IBAction) bring_to_front:(id) sender;
- -(IBAction) close_window:(id) sender;
- -(IBAction) minimize_window:(id) sender;
- -(IBAction) zoom_window:(id) sender;
- -(IBAction) next_window:(id) sender;
- -(IBAction) previous_window:(id) sender;
- -(IBAction) enable_fullscreen_changed:(id) sender;
- -(IBAction) toggle_fullscreen:(id) sender;
- -(IBAction) prefs_changed:(id) sender;
- -(IBAction) prefs_show:(id) sender;
- -(IBAction) quit:(id) sender;
- -(IBAction) x11_help:(id) sender;
+- (void)set_can_quit:(OSX_BOOL)state;
+- (void)server_ready;
+- (OSX_BOOL)application:(NSApplication *)app openFile:(NSString *)filename;
+
+- (IBAction)apps_table_show:(id)sender;
+- (IBAction)apps_table_done:(id)sender;
+- (IBAction)apps_table_new:(id)sender;
+- (IBAction)apps_table_duplicate:(id)sender;
+- (IBAction)apps_table_delete:(id)sender;
+- (IBAction)bring_to_front:(id)sender;
+- (IBAction)close_window:(id)sender;
+- (IBAction)minimize_window:(id)sender;
+- (IBAction)zoom_window:(id)sender;
+- (IBAction)next_window:(id)sender;
+- (IBAction)previous_window:(id)sender;
+- (IBAction)enable_fullscreen_changed:(id)sender;
+- (IBAction)toggle_fullscreen:(id)sender;
+- (IBAction)prefs_changed:(id)sender;
+- (IBAction)prefs_show:(id)sender;
+- (IBAction)quit:(id)sender;
+- (IBAction)x11_help:(id)sender;
 
 @end
-#endif                          /* __OBJC__ */
+
+#endif /* __OBJC__ */
+
 void
 X11ControllerMain(int argc, char **argv, char **envp);
 
-#endif                          /* X11CONTROLLER_H */
+#endif /* X11CONTROLLER_H */
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m
index b0bfc5858..393bc1abe 100644
--- a/xorg-server/hw/xquartz/X11Controller.m
+++ b/xorg-server/hw/xquartz/X11Controller.m
@@ -1,31 +1,32 @@
 /* X11Controller.m -- connect the IB ui, also the NSApp delegate
- 
-   Copyright (c) 2002-2008 Apple 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
- 
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #include "sanitizedCarbon.h"
 #include <AvailabilityMacros.h>
@@ -53,145 +54,159 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-@ implementation X11Controller - (void) awakeFromNib {
+@implementation X11Controller
+
+- (void) awakeFromNib
+{
     X11Application *xapp = NSApp;
     NSArray *array;
 
     /* Point X11Application at ourself. */
- [xapp set_controller:self];
+    [xapp set_controller:self];
 
- array =[xapp prefs_get_array:@PREFS_APPSMENU];
+    array = [xapp prefs_get_array:@PREFS_APPSMENU];
     if (array != nil) {
         int count;
 
         /* convert from [TITLE1 COMMAND1 TITLE2 COMMAND2 ...]
            to [[TITLE1 COMMAND1] [TITLE2 COMMAND2] ...] format. */
 
-        count =[array count];
- if (count > 0 && ![[array objectAtIndex: 0] isKindOfClass:[NSArray class]])
-        {
+        count = [array count];
+        if (count > 0
+            && ![[array objectAtIndex:0] isKindOfClass:[NSArray class]]) {
             int i;
             NSMutableArray *copy, *sub;
 
- copy =[NSMutableArray arrayWithCapacity:(count / 2)];
+            copy = [NSMutableArray arrayWithCapacity:(count / 2)];
 
             for (i = 0; i < count / 2; i++) {
- sub =[[NSMutableArray alloc] initWithCapacity:3];
- [sub addObject: [array objectAtIndex:i * 2]];
- [sub addObject: [array objectAtIndex:i * 2 + 1]];
- [sub addObject:@""];
- [copy addObject:sub];
+                sub = [[NSMutableArray alloc] initWithCapacity:3];
+                [sub addObject:[array objectAtIndex:i * 2]];
+                [sub addObject:[array objectAtIndex:i * 2 + 1]];
+                [sub addObject:@""];
+                [copy addObject:sub];
                 [sub release];
             }
 
             array = copy;
         }
 
- [self set_apps_menu:array];
+        [self set_apps_menu:array];
     }
 
     [[NSNotificationCenter defaultCenter]
- addObserver: self selector: @selector(apps_table_done:)
- name: NSWindowWillCloseNotification object:[apps_table window]];
+     addObserver: self
+        selector: @selector(apps_table_done:)
+            name: NSWindowWillCloseNotification
+          object: [apps_table window]];
 
     // Setup data about our Windows menu
     if (window_separator) {
- [[window_separator menu] removeItem:window_separator];
+        [[window_separator menu] removeItem:window_separator];
         window_separator = nil;
     }
 
-    windows_menu_start =[[X11App windowsMenu] numberOfItems];
+    windows_menu_start = [[X11App windowsMenu] numberOfItems];
 }
 
- -(void) item_selected:sender {
- [NSApp activateIgnoringOtherApps:YES];
+- (void) item_selected:sender
+{
+    [NSApp activateIgnoringOtherApps:YES];
 
     DarwinSendDDXEvent(kXquartzControllerNotify, 2,
-                       AppleWMWindowMenuItem,[sender tag]);
+                       AppleWMWindowMenuItem, [sender tag]);
 }
 
--(void) remove_window_menu {
+- (void) remove_window_menu
+{
     NSMenu *menu;
     int count, i;
 
     /* Work backwards so we don't mess up the indices */
-    menu =[X11App windowsMenu];
-    count =[menu numberOfItems];
+    menu = [X11App windowsMenu];
+    count = [menu numberOfItems];
     for (i = count - 1; i >= windows_menu_start; i--)
- [menu removeItemAtIndex:i];
+        [menu removeItemAtIndex:i];
 
- count =[dock_menu indexOfItem:dock_window_separator];
+    count = [dock_menu indexOfItem:dock_window_separator];
     for (i = 0; i < count; i++)
- [dock_menu removeItemAtIndex:0];
+        [dock_menu removeItemAtIndex:0];
 }
 
- -(void) install_window_menu:(NSArray *) list {
+- (void) install_window_menu:(NSArray *)list
+{
     NSMenu *menu;
     NSMenuItem *item;
     int first, count, i;
 
-    menu =[X11App windowsMenu];
+    menu = [X11App windowsMenu];
     first = windows_menu_start + 1;
-    count =[list count];
+    count = [list count];
 
     // Push a Separator
     if (count) {
- [menu addItem:[NSMenuItem separatorItem]];
+        [menu addItem:[NSMenuItem separatorItem]];
     }
 
     for (i = 0; i < count; i++) {
         NSString *name, *shortcut;
 
- name =[[list objectAtIndex: i] objectAtIndex:0];
- shortcut =[[list objectAtIndex: i] objectAtIndex:1];
+        name = [[list objectAtIndex:i] objectAtIndex:0];
+        shortcut = [[list objectAtIndex:i] objectAtIndex:1];
 
         if (windowItemModMask == 0 || windowItemModMask == -1)
             shortcut = @"";
 
- item = (NSMenuItem *)[menu addItemWithTitle: name action: @selector(item_selected: )keyEquivalent:shortcut];
- [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
- [item setTarget:self];
- [item setTag:i];
- [item setEnabled:YES];
-
- item = (NSMenuItem *)[dock_menu insertItemWithTitle: name action: @selector(item_selected: )keyEquivalent: shortcut atIndex:i];
- [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
- [item setTarget:self];
- [item setTag:i];
- [item setEnabled:YES];
+        item =
+            (NSMenuItem *)[menu addItemWithTitle:name action:
+                           @selector
+                           (item_selected:) keyEquivalent:shortcut];
+        [item setKeyEquivalentModifierMask:(NSUInteger)windowItemModMask];
+        [item setTarget:self];
+        [item setTag:i];
+        [item setEnabled:YES];
+
+        item = (NSMenuItem *)[dock_menu  insertItemWithTitle:name
+                                                      action:@selector
+                              (item_selected:) keyEquivalent:shortcut
+                                                     atIndex:i];
+        [item setKeyEquivalentModifierMask:(NSUInteger)windowItemModMask];
+        [item setTarget:self];
+        [item setTag:i];
+        [item setEnabled:YES];
     }
 
     if (checked_window_item >= 0 && checked_window_item < count) {
- item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item];
- [item setState:NSOnState];
- item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item];
- [item setState:NSOnState];
+        item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item];
+        [item setState:NSOnState];
+        item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item];
+        [item setState:NSOnState];
     }
 }
 
--(void) remove_apps_menu {
+- (void) remove_apps_menu
+{
     NSMenu *menu;
     NSMenuItem *item;
     int i;
 
-    if (apps == nil || apps_separator == nil)
-        return;
+    if (apps == nil || apps_separator == nil) return;
 
-    menu =[apps_separator menu];
+    menu = [apps_separator menu];
 
     if (menu != nil) {
-        for (i =[menu numberOfItems] - 1; i >= 0; i--) {
- item = (NSMenuItem *)[menu itemAtIndex:i];
+        for (i = [menu numberOfItems] - 1; i >= 0; i--) {
+            item = (NSMenuItem *)[menu itemAtIndex:i];
             if ([item tag] != 0)
- [menu removeItemAtIndex:i];
+                [menu removeItemAtIndex:i];
         }
     }
 
     if (dock_apps_menu != nil) {
-        for (i =[dock_apps_menu numberOfItems] - 1; i >= 0; i--) {
- item = (NSMenuItem *)[dock_apps_menu itemAtIndex:i];
+        for (i = [dock_apps_menu numberOfItems] - 1; i >= 0; i--) {
+            item = (NSMenuItem *)[dock_apps_menu itemAtIndex:i];
             if ([item tag] != 0)
- [dock_apps_menu removeItemAtIndex:i];
+                [dock_apps_menu removeItemAtIndex:i];
         }
     }
 
@@ -199,129 +214,139 @@
     apps = nil;
 }
 
- -(void) prepend_apps_item:(NSArray *)
-list index:(int)
-i menu:(NSMenu *) menu
+- (void) prepend_apps_item:(NSArray *)list index:(int)i menu:(NSMenu *)menu
 {
     NSString *title, *shortcut = @"";
     NSArray *group;
     NSMenuItem *item;
 
- group =[list objectAtIndex:i];
- title =[group objectAtIndex:0];
+    group = [list objectAtIndex:i];
+    title = [group objectAtIndex:0];
     if ([group count] >= 3)
- shortcut =[group objectAtIndex:2];
+        shortcut = [group objectAtIndex:2];
 
     if ([title length] != 0) {
- item = (NSMenuItem *)[menu insertItemWithTitle: title action: @selector(app_selected:)
- keyEquivalent: shortcut atIndex:0];
- [item setTarget:self];
- [item setEnabled:YES];
+        item = (NSMenuItem *)[menu insertItemWithTitle:title
+                                                action:@selector (
+                                  app_selected:)
+                              keyEquivalent:shortcut atIndex:0];
+        [item setTarget:self];
+        [item setEnabled:YES];
     }
     else {
         item = (NSMenuItem *)[NSMenuItem separatorItem];
- [menu insertItem: item atIndex:0];
+        [menu insertItem:item atIndex:0];
     }
 
- [item setTag:i + 1];          /* can't be zero, so add one */
+    [item setTag:i + 1];                  /* can't be zero, so add one */
 }
 
- -(void) install_apps_menu:(NSArray *) list {
+- (void) install_apps_menu:(NSArray *)list
+{
     NSMenu *menu;
     int i, count;
 
-    count =[list count];
+    count = [list count];
 
-    if (count == 0 || apps_separator == nil)
-        return;
+    if (count == 0 || apps_separator == nil) return;
 
-    menu =[apps_separator menu];
+    menu = [apps_separator menu];
 
     for (i = count - 1; i >= 0; i--) {
         if (menu != nil)
- [self prepend_apps_item: list index: i menu:menu];
+            [self prepend_apps_item:list index:i menu:menu];
         if (dock_apps_menu != nil)
- [self prepend_apps_item: list index: i menu:dock_apps_menu];
+            [self prepend_apps_item:list index:i menu:dock_apps_menu];
     }
 
-    apps =[list retain];
+    apps = [list retain];
 }
 
- -(void) set_window_menu:(NSArray *) list {
+- (void) set_window_menu:(NSArray *)list
+{
     [self remove_window_menu];
- [self install_window_menu:list];
+    [self install_window_menu:list];
 
-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMWindowMenuNotify);
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1,
+                       AppleWMWindowMenuNotify);
 }
 
- -(void) set_window_menu_check:(NSNumber *) nn {
+- (void) set_window_menu_check:(NSNumber *)nn
+{
     NSMenu *menu;
     NSMenuItem *item;
     int first, count;
-    int n =[nn intValue];
+    int n = [nn intValue];
 
-    menu =[X11App windowsMenu];
+    menu = [X11App windowsMenu];
     first = windows_menu_start + 1;
-    count =[menu numberOfItems] - first;
+    count = [menu numberOfItems] - first;
 
     if (checked_window_item >= 0 && checked_window_item < count) {
- item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item];
- [item setState:NSOffState];
- item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item];
- [item setState:NSOffState];
+        item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item];
+        [item setState:NSOffState];
+        item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item];
+        [item setState:NSOffState];
     }
     if (n >= 0 && n < count) {
- item = (NSMenuItem *)[menu itemAtIndex:first + n];
- [item setState:NSOnState];
- item = (NSMenuItem *)[dock_menu itemAtIndex:n];
- [item setState:NSOnState];
+        item = (NSMenuItem *)[menu itemAtIndex:first + n];
+        [item setState:NSOnState];
+        item = (NSMenuItem *)[dock_menu itemAtIndex:n];
+        [item setState:NSOnState];
     }
     checked_window_item = n;
 }
 
- -(void) set_apps_menu:(NSArray *) list {
+- (void) set_apps_menu:(NSArray *)list
+{
     [self remove_apps_menu];
- [self install_apps_menu:list];
+    [self install_apps_menu:list];
 }
 
 #ifdef XQUARTZ_SPARKLE
--(void) setup_sparkle {
+- (void) setup_sparkle
+{
     if (check_for_updates_item)
-        return;                 // already did it...
+        return;  // already did it...
 
-    NSMenu *menu =[x11_about_item menu];
+    NSMenu *menu = [x11_about_item menu];
 
- check_for_updates_item =[menu insertItemWithTitle:NSLocalizedString(@"Check for X11 Updates...",
-                      @"Check for X11 Updates...")
- action: @selector(checkForUpdates:)
- keyEquivalent: @"" atIndex:1];
- [check_for_updates_item setTarget:[SUUpdater sharedUpdater]];
- [check_for_updates_item setEnabled:YES];
+    check_for_updates_item =
+        [menu insertItemWithTitle:NSLocalizedString(
+             @"Check for X11 Updates...",
+             @"Check for X11 Updates...")
+         action:@selector (
+             checkForUpdates:)
+         keyEquivalent:@""
+         atIndex:1];
+    [check_for_updates_item setTarget:[SUUpdater sharedUpdater]];
+    [check_for_updates_item setEnabled:YES];
 
     // Set X11Controller as the delegate for the updater.
- [[SUUpdater sharedUpdater] setDelegate:self];
+    [[SUUpdater sharedUpdater] setDelegate:self];
 }
 
 // Sent immediately before installing the specified update.
- -(void) updater:(SUUpdater *)
-updater willInstallUpdate:(SUAppcastItem *) update
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)
+   update
 {
     //[self set_can_quit:YES];
 }
 
 #endif
 
- -(void) launch_client:(NSString *) filename {
+- (void) launch_client:(NSString *)filename
+{
     int child1, child2 = 0;
     int status;
     const char *newargv[4];
     char buf[128];
     char *s;
 
-newargv[0] =[X11App prefs_get_string: @PREFS_LOGIN_SHELL default:
-"/bin/sh"];
+    newargv[0] =
+        [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
     newargv[1] = "-c";
-    newargv[2] =[filename UTF8String];
+    newargv[2] = [filename UTF8String];
     newargv[3] = NULL;
 
     s = getenv("DISPLAY");
@@ -333,19 +358,19 @@ newargv[0] =[X11App prefs_get_string: @PREFS_LOGIN_SHELL default:
     /* Do the fork-twice trick to avoid having to reap zombies */
     child1 = fork();
     switch (child1) {
-    case -1:                   /* error */
+    case -1:                                    /* error */
         break;
 
-    case 0:                    /* child1 */
+    case 0:                                     /* child1 */
         child2 = fork();
 
         switch (child2) {
             int max_files, i;
 
-        case -1:               /* error */
+        case -1:                                    /* error */
             _exit(1);
 
-        case 0:                /* child2 */
+        case 0:                                     /* child2 */
             /* close all open files except for standard streams */
             max_files = sysconf(_SC_OPEN_MAX);
             for (i = 3; i < max_files; i++)
@@ -355,334 +380,350 @@ newargv[0] =[X11App prefs_get_string: @PREFS_LOGIN_SHELL default:
             close(0);
             open("/dev/null", O_RDONLY);
 
-            execvp(newargv[0], (char **const) newargv);
+            execvp(newargv[0], (char * *const)newargv);
             _exit(2);
 
-        default:               /* parent (child1) */
+        default:                                    /* parent (child1) */
             _exit(0);
         }
         break;
 
-    default:                   /* parent */
+    default:                                    /* parent */
         waitpid(child1, &status, 0);
     }
 }
 
- -(void) app_selected:sender {
+- (void) app_selected:sender
+{
     int tag;
     NSString *item;
 
-    tag =[sender tag] - 1;
-    if (apps == nil || tag < 0 || tag >=[apps count])
+    tag = [sender tag] - 1;
+    if (apps == nil || tag < 0 || tag >= [apps count])
         return;
 
- item =[[apps objectAtIndex: tag] objectAtIndex:1];
+    item = [[apps objectAtIndex:tag] objectAtIndex:1];
 
- [self launch_client:item];
+    [self launch_client:item];
 }
 
- -(IBAction) apps_table_show:sender {
+- (IBAction) apps_table_show:sender
+{
     NSArray *columns;
     NSMutableArray *oldapps = nil;
 
     if (table_apps != nil)
         oldapps = table_apps;
 
- table_apps =[[NSMutableArray alloc] initWithCapacity:1];
+    table_apps = [[NSMutableArray alloc] initWithCapacity:1];
     if (apps != nil)
- [table_apps addObjectsFromArray:apps];
+        [table_apps addObjectsFromArray:apps];
 
-    columns =[apps_table tableColumns];
- [[columns objectAtIndex: 0] setIdentifier:@"0"];
- [[columns objectAtIndex: 1] setIdentifier:@"1"];
- [[columns objectAtIndex: 2] setIdentifier:@"2"];
+    columns = [apps_table tableColumns];
+    [[columns objectAtIndex:0] setIdentifier:@"0"];
+    [[columns objectAtIndex:1] setIdentifier:@"1"];
+    [[columns objectAtIndex:2] setIdentifier:@"2"];
 
- [apps_table setDataSource:self];
- [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: 0] byExtendingSelection:NO];
+    [apps_table setDataSource:self];
+    [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
+     byExtendingSelection:NO];
 
- [[apps_table window] makeKeyAndOrderFront:sender];
+    [[apps_table window] makeKeyAndOrderFront:sender];
     [apps_table reloadData];
     if (oldapps != nil)
         [oldapps release];
 }
 
- -(IBAction) apps_table_done:sender {
- [apps_table deselectAll:sender];
-                                /* flush edits? */
+- (IBAction) apps_table_done:sender
+{
+    [apps_table deselectAll:sender];    /* flush edits? */
 
     [self remove_apps_menu];
- [self install_apps_menu:table_apps];
+    [self install_apps_menu:table_apps];
 
- [NSApp prefs_set_array: @PREFS_APPSMENU value:table_apps];
+    [NSApp prefs_set_array:@PREFS_APPSMENU value:table_apps];
     [NSApp prefs_synchronize];
 
- [[apps_table window] orderOut:sender];
+    [[apps_table window] orderOut:sender];
 
     [table_apps release];
     table_apps = nil;
 }
 
- -(IBAction) apps_table_new:sender {
+- (IBAction) apps_table_new:sender
+{
     NSMutableArray *item;
 
-    int row =[apps_table selectedRow], i;
+    int row = [apps_table selectedRow], i;
 
-    if (row < 0)
-        row = 0;
-    else
-        row = row + 1;
+    if (row < 0) row = 0;
+    else row = row + 1;
 
     i = row;
-    if (i >[table_apps count])
-        return;                 /* avoid exceptions */
+    if (i > [table_apps count])
+        return;                         /* avoid exceptions */
 
- [apps_table deselectAll:sender];
+    [apps_table deselectAll:sender];
 
- item =[[NSMutableArray alloc] initWithCapacity:3];
- [item addObject:@""];
- [item addObject:@""];
- [item addObject:@""];
+    item = [[NSMutableArray alloc] initWithCapacity:3];
+    [item addObject:@""];
+    [item addObject:@""];
+    [item addObject:@""];
 
- [table_apps insertObject: item atIndex:i];
+    [table_apps insertObject:item atIndex:i];
     [item release];
 
     [apps_table reloadData];
- [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection:NO];
+    [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
+     byExtendingSelection:NO];
 }
 
- -(IBAction) apps_table_duplicate:sender {
-    int row =[apps_table selectedRow], i;
+- (IBAction) apps_table_duplicate:sender
+{
+    int row = [apps_table selectedRow], i;
     NSObject *item;
 
     if (row < 0) {
- [self apps_table_new:sender];
+        [self apps_table_new:sender];
         return;
     }
 
     i = row;
-    if (i >[table_apps count] - 1)
-        return;                 /* avoid exceptions */
+    if (i > [table_apps count] - 1) return;                             /* avoid exceptions */
 
- [apps_table deselectAll:sender];
+    [apps_table deselectAll:sender];
 
- item =[[table_apps objectAtIndex:i] mutableCopy];
- [table_apps insertObject: item atIndex:i];
+    item = [[table_apps objectAtIndex:i] mutableCopy];
+    [table_apps insertObject:item atIndex:i];
     [item release];
 
     [apps_table reloadData];
- [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: row + 1] byExtendingSelection:NO];
+    [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row +
+                                  1] byExtendingSelection:NO];
 }
 
- -(IBAction) apps_table_delete:sender {
-    int row =[apps_table selectedRow];
+- (IBAction) apps_table_delete:sender
+{
+    int row = [apps_table selectedRow];
 
     if (row >= 0) {
         int i = row;
 
-        if (i >[table_apps count] - 1)
-            return;             /* avoid exceptions */
+        if (i > [table_apps count] - 1) return;                 /* avoid exceptions */
 
- [apps_table deselectAll:sender];
+        [apps_table deselectAll:sender];
 
- [table_apps removeObjectAtIndex:i];
+        [table_apps removeObjectAtIndex:i];
     }
 
     [apps_table reloadData];
 
-    row = MIN(row,[table_apps count] - 1);
+    row = MIN(row, [table_apps count] - 1);
     if (row >= 0)
- [apps_table selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection:NO];
+        [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
+         byExtendingSelection:NO];
 }
 
- -(NSInteger) numberOfRowsInTableView:(NSTableView *) tableView {
-    if (table_apps == nil)
-        return 0;
+- (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView
+{
+    if (table_apps == nil) return 0;
 
-    return[table_apps count];
+    return [table_apps count];
 }
 
- -(id) tableView: (NSTableView *) tableView objectValueForTableColumn:(NSTableColumn
- *)
-tableColumn row:(NSInteger) row
+- (id)             tableView:(NSTableView *)tableView
+   objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
     NSArray *item;
     int col;
 
-    if (table_apps == nil)
-        return nil;
+    if (table_apps == nil) return nil;
 
-    col =[[tableColumn identifier] intValue];
+    col = [[tableColumn identifier] intValue];
 
- item =[table_apps objectAtIndex:row];
+    item = [table_apps objectAtIndex:row];
     if ([item count] > col)
- return[item objectAtIndex:col];
+        return [item objectAtIndex:col];
     else
         return @"";
 }
 
- -(void) tableView:(NSTableView *)
-tableView setObjectValue:(id) object forTableColumn:(NSTableColumn *)
-tableColumn row:(NSInteger) row
+- (void) tableView:(NSTableView *)tableView setObjectValue:(id)object
+    forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
     NSMutableArray *item;
     int col;
 
-    if (table_apps == nil)
-        return;
+    if (table_apps == nil) return;
 
-    col =[[tableColumn identifier] intValue];
+    col = [[tableColumn identifier] intValue];
 
- item =[table_apps objectAtIndex:row];
- [item replaceObjectAtIndex: col withObject:object];
+    item = [table_apps objectAtIndex:row];
+    [item replaceObjectAtIndex:col withObject:object];
 }
 
- -(void) hide_window:sender {
+- (void) hide_window:sender
+{
     if ([X11App x_active])
         DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideWindow);
     else
-        NSBeep();               /* FIXME: something here */
+        NSBeep();                       /* FIXME: something here */
 }
 
- -(IBAction) bring_to_front:sender {
+- (IBAction)bring_to_front:sender
+{
     DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMBringAllToFront);
 }
 
- -(IBAction) close_window:sender {
+- (IBAction)close_window:sender
+{
     if ([X11App x_active])
         DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMCloseWindow);
     else
- [[NSApp keyWindow] performClose:sender];
+        [[NSApp keyWindow] performClose:sender];
 }
 
- -(IBAction) minimize_window:sender {
+- (IBAction)minimize_window:sender
+{
     if ([X11App x_active])
         DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMMinimizeWindow);
     else
- [[NSApp keyWindow] performMiniaturize:sender];
+        [[NSApp keyWindow] performMiniaturize:sender];
 }
 
- -(IBAction) zoom_window:sender {
+- (IBAction)zoom_window:sender
+{
     if ([X11App x_active])
         DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMZoomWindow);
     else
- [[NSApp keyWindow] performZoom:sender];
+        [[NSApp keyWindow] performZoom:sender];
 }
 
- -(IBAction) next_window:sender {
+- (IBAction) next_window:sender
+{
     DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMNextWindow);
 }
 
- -(IBAction) previous_window:sender {
+- (IBAction) previous_window:sender
+{
     DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMPreviousWindow);
 }
 
- -(IBAction) enable_fullscreen_changed:sender {
+- (IBAction) enable_fullscreen_changed:sender
+{
     XQuartzRootlessDefault = ![enable_fullscreen intValue];
 
- [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
- [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[NSColor disabledControlTextColor] :[NSColor
-                                                                 controlTextColor]];
+    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
+    [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[
+         NSColor disabledControlTextColor] : [NSColor controlTextColor]];
 
     DarwinSendDDXEvent(kXquartzSetRootless, 1, XQuartzRootlessDefault);
 
- [NSApp prefs_set_boolean: @PREFS_ROOTLESS value:XQuartzRootlessDefault];
+    [NSApp prefs_set_boolean:@PREFS_ROOTLESS value:XQuartzRootlessDefault];
     [NSApp prefs_synchronize];
 }
 
- -(IBAction) toggle_fullscreen:sender {
+- (IBAction) toggle_fullscreen:sender
+{
     DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
 }
 
- -(void) set_can_quit:(OSX_BOOL) state {
+- (void) set_can_quit:(OSX_BOOL)state
+{
     can_quit = state;
 }
 
- -(IBAction) prefs_changed:sender {
+- (IBAction)prefs_changed:sender
+{
     if (!sender)
         return;
 
     if (sender == fake_buttons) {
-        darwinFakeButtons =[fake_buttons intValue];
- [NSApp prefs_set_boolean: @PREFS_FAKEBUTTONS value:darwinFakeButtons];
+        darwinFakeButtons = [fake_buttons intValue];
+        [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons];
     }
     else if (sender == enable_keyequivs) {
-        XQuartzEnableKeyEquivalents =[enable_keyequivs intValue];
- [NSApp prefs_set_boolean: @PREFS_KEYEQUIVS value:XQuartzEnableKeyEquivalents];
+        XQuartzEnableKeyEquivalents = [enable_keyequivs intValue];
+        [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:
+         XQuartzEnableKeyEquivalents];
     }
     else if (sender == sync_keymap) {
-        darwinSyncKeymap =[sync_keymap intValue];
- [NSApp prefs_set_boolean: @PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
+        darwinSyncKeymap = [sync_keymap intValue];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
     }
     else if (sender == enable_fullscreen_menu) {
-        XQuartzFullscreenMenu =[enable_fullscreen_menu intValue];
- [NSApp prefs_set_boolean: @PREFS_FULLSCREEN_MENU value:XQuartzFullscreenMenu];
+        XQuartzFullscreenMenu = [enable_fullscreen_menu intValue];
+        [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:
+         XQuartzFullscreenMenu];
     }
     else if (sender == option_sends_alt) {
         BOOL prev_opt_sends_alt = XQuartzOptionSendsAlt;
 
-        XQuartzOptionSendsAlt =[option_sends_alt intValue];
- [NSApp prefs_set_boolean: @PREFS_OPTION_SENDS_ALT value:XQuartzOptionSendsAlt];
+        XQuartzOptionSendsAlt = [option_sends_alt intValue];
+        [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value:
+         XQuartzOptionSendsAlt];
 
         if (prev_opt_sends_alt != XQuartzOptionSendsAlt)
             QuartsResyncKeymap(TRUE);
     }
     else if (sender == click_through) {
- [NSApp prefs_set_boolean: @PREFS_CLICK_THROUGH value:[click_through
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through
+                                                             intValue]];
     }
     else if (sender == focus_follows_mouse) {
- [NSApp prefs_set_boolean: @PREFS_FFM value:[focus_follows_mouse
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse
+                                                   intValue]];
     }
     else if (sender == focus_on_new_window) {
- [NSApp prefs_set_boolean: @PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[
+             focus_on_new_window intValue]];
     }
     else if (sender == enable_auth) {
- [NSApp prefs_set_boolean: @PREFS_NO_AUTH value:![enable_auth
-          intValue]];
+        [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]
+        ];
     }
     else if (sender == enable_tcp) {
- [NSApp prefs_set_boolean: @PREFS_NO_TCP value:![enable_tcp intValue]];
+        [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
     }
     else if (sender == depth) {
- [NSApp prefs_set_integer: @PREFS_DEPTH value:[depth selectedTag]];
+        [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
     }
     else if (sender == sync_pasteboard) {
-        BOOL pbproxy_active =[sync_pasteboard intValue];
-
- [NSApp prefs_set_boolean: @PREFS_SYNC_PB value:pbproxy_active];
+        BOOL pbproxy_active = [sync_pasteboard intValue];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active];
 
- [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
- [sync_pasteboard_to_primary setEnabled:pbproxy_active];
- [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
- [sync_primary_immediately setEnabled:pbproxy_active];
+        [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+        [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+        [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+        [sync_primary_immediately setEnabled:pbproxy_active];
 
         // setEnabled doesn't do this...
- [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
-                                                     disabledControlTextColor]];
- [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
-                                                     disabledControlTextColor]];
+        [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] :
+         [NSColor disabledControlTextColor]];
+        [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] :
+         [NSColor disabledControlTextColor]];
     }
     else if (sender == sync_pasteboard_to_clipboard) {
- [NSApp prefs_set_boolean: @PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[
+             sync_pasteboard_to_clipboard intValue]];
     }
     else if (sender == sync_pasteboard_to_primary) {
- [NSApp prefs_set_boolean: @PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[
+             sync_pasteboard_to_primary intValue]];
     }
     else if (sender == sync_clipboard_to_pasteboard) {
- [NSApp prefs_set_boolean: @PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[
+             sync_clipboard_to_pasteboard intValue]];
     }
     else if (sender == sync_primary_immediately) {
- [NSApp prefs_set_boolean: @PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately
-         intValue]];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[
+             sync_primary_immediately intValue]];
     }
     else if (sender == scroll_in_device_direction) {
-        XQuartzScrollInDeviceDirection =[scroll_in_device_direction intValue];
- [NSApp prefs_set_boolean: @PREFS_SCROLL_IN_DEV_DIRECTION value:XQuartzScrollInDeviceDirection];
+        XQuartzScrollInDeviceDirection =
+            [scroll_in_device_direction intValue];
+        [NSApp prefs_set_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION value:
+         XQuartzScrollInDeviceDirection];
     }
 
     [NSApp prefs_synchronize];
@@ -690,9 +731,10 @@ tableColumn row:(NSInteger) row
     DarwinSendDDXEvent(kXquartzReloadPreferences, 0);
 }
 
- -(IBAction) prefs_show:sender {
-BOOL pbproxy_active =[NSApp prefs_get_boolean: @PREFS_SYNC_PB default:
-YES];
+- (IBAction) prefs_show:sender
+{
+    BOOL pbproxy_active =
+        [NSApp prefs_get_boolean:@PREFS_SYNC_PB default:YES];
 
     // Remove preferences from the GUI which are not supported
     // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
@@ -701,116 +743,129 @@ YES];
         scroll_in_device_direction = nil;
     }
     else {
- [scroll_in_device_direction setIntValue:XQuartzScrollInDeviceDirection];
-    }
-
- [fake_buttons setIntValue:darwinFakeButtons];
- [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];
- [sync_keymap setIntValue:darwinSyncKeymap];
- [option_sends_alt setIntValue:XQuartzOptionSendsAlt];
-[click_through setIntValue: [NSApp prefs_get_boolean: @PREFS_CLICK_THROUGH default:
-NO]];
-[focus_follows_mouse setIntValue: [NSApp prefs_get_boolean: @PREFS_FFM default:
-NO]];
-[focus_on_new_window setIntValue: [NSApp prefs_get_boolean: @PREFS_FOCUS_ON_NEW_WINDOW default:
-YES]];
-
-[enable_auth setIntValue: ![NSApp prefs_get_boolean: @PREFS_NO_AUTH default:
-NO]];
-[enable_tcp setIntValue: ![NSApp prefs_get_boolean: @PREFS_NO_TCP default:
-NO]];
-
-[depth selectItemAtIndex: [depth indexOfItemWithTag: [NSApp prefs_get_integer: @PREFS_DEPTH default:
--1]]];
-
- [sync_pasteboard setIntValue:pbproxy_active];
-[sync_pasteboard_to_clipboard setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_PB_TO_CLIPBOARD default:
-YES]];
-[sync_pasteboard_to_primary setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_PB_TO_PRIMARY default:
-YES]];
-[sync_clipboard_to_pasteboard setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_CLIPBOARD_TO_PB default:
-YES]];
-[sync_primary_immediately setIntValue: [NSApp prefs_get_boolean: @PREFS_SYNC_PRIMARY_ON_SELECT default:
-NO]];
-
- [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
- [sync_pasteboard_to_primary setEnabled:pbproxy_active];
- [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
- [sync_primary_immediately setEnabled:pbproxy_active];
+        [scroll_in_device_direction setIntValue:
+         XQuartzScrollInDeviceDirection];
+    }
+
+    [fake_buttons setIntValue:darwinFakeButtons];
+    [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];
+    [sync_keymap setIntValue:darwinSyncKeymap];
+    [option_sends_alt setIntValue:XQuartzOptionSendsAlt];
+    [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH
+                                default:NO]];
+    [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM
+                                      default:NO]];
+    [focus_on_new_window setIntValue:[NSApp prefs_get_boolean:
+                                      @PREFS_FOCUS_ON_NEW_WINDOW default:YES]
+    ];
+
+    [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default
+                               :NO]];
+    [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:
+                              NO]];
+
+    [depth selectItemAtIndex:[depth indexOfItemWithTag:[NSApp
+                                                        prefs_get_integer:
+                                                        @PREFS_DEPTH default:
+                                                        -1]]];
+
+    [sync_pasteboard setIntValue:pbproxy_active];
+    [sync_pasteboard_to_clipboard setIntValue:[NSApp prefs_get_boolean:
+                                               @PREFS_SYNC_PB_TO_CLIPBOARD
+                                               default:YES]];
+    [sync_pasteboard_to_primary setIntValue:[NSApp prefs_get_boolean:
+                                             @PREFS_SYNC_PB_TO_PRIMARY
+                                             default:YES]];
+    [sync_clipboard_to_pasteboard setIntValue:[NSApp prefs_get_boolean:
+                                               @PREFS_SYNC_CLIPBOARD_TO_PB
+                                               default:YES]];
+    [sync_primary_immediately setIntValue:[NSApp prefs_get_boolean:
+                                           @PREFS_SYNC_PRIMARY_ON_SELECT
+                                           default:NO]];
+
+    [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+    [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+    [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+    [sync_primary_immediately setEnabled:pbproxy_active];
 
     // setEnabled doesn't do this...
- [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
-                                                 disabledControlTextColor]];
- [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] :[NSColor
-                                                 disabledControlTextColor]];
+    [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] : [
+         NSColor disabledControlTextColor]];
+    [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] : [
+         NSColor disabledControlTextColor]];
 
- [enable_fullscreen setIntValue:!XQuartzRootlessDefault];
- [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu];
- [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
- [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[NSColor disabledControlTextColor] :[NSColor
-                                                                 controlTextColor]];
+    [enable_fullscreen setIntValue:!XQuartzRootlessDefault];
+    [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu];
+    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
+    [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[
+         NSColor disabledControlTextColor] : [NSColor controlTextColor]];
 
- [prefs_panel makeKeyAndOrderFront:sender];
+    [prefs_panel makeKeyAndOrderFront:sender];
 }
 
- -(IBAction) quit:sender {
+- (IBAction) quit:sender
+{
     DarwinSendDDXEvent(kXquartzQuit, 0);
 }
 
- -(IBAction) x11_help:sender {
+- (IBAction) x11_help:sender
+{
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-    AHLookupAnchor((CFStringRef) NSLocalizedString(@"Mac Help", no comment),
+    AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help",
+                                                  no comment),
                    CFSTR("mchlp2276"));
 #else
     AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276"));
 #endif
 }
 
- -(OSX_BOOL) validateMenuItem:(NSMenuItem *) item {
-    NSMenu *menu =[item menu];
+- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item
+{
+    NSMenu *menu = [item menu];
 
     if (item == toggle_fullscreen_item)
         return !XQuartzIsRootless;
-    else if (menu ==[X11App windowsMenu] || menu == dock_menu
-             || (menu ==[x11_about_item menu] &&[item tag] == 42))
+    else if (menu == [X11App windowsMenu] || menu == dock_menu
+             || (menu == [x11_about_item menu] && [item tag] == 42))
         return (AppleWMSelectedEvents() & AppleWMControllerNotifyMask) != 0;
     else
         return TRUE;
 }
 
- -(void) applicationDidHide:(NSNotification *) notify {
+- (void) applicationDidHide:(NSNotification *)notify
+{
     DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll);
 
-    /* Toggle off fullscreen mode to leave our non-default video 
-     * mode and hide our guard window.                          
+    /* Toggle off fullscreen mode to leave our non-default video
+     * mode and hide our guard window.
      */
     if (!XQuartzIsRootless && XQuartzFullscreenVisible) {
         DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
     }
 }
 
- -(void) applicationDidUnhide:(NSNotification *) notify {
+- (void) applicationDidUnhide:(NSNotification *)notify
+{
     DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMShowAll);
 }
 
- -(NSApplicationTerminateReply) applicationShouldTerminate:sender {
+- (NSApplicationTerminateReply) applicationShouldTerminate:sender
+{
     NSString *msg;
     NSString *title;
 
-if (can_quit ||[X11App prefs_get_boolean: @PREFS_NO_QUIT_ALERT default:
-NO])
+    if (can_quit ||
+        [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO])
         return NSTerminateNow;
 
     /* Make sure we're frontmost. */
- [NSApp activateIgnoringOtherApps:YES];
+    [NSApp activateIgnoringOtherApps:YES];
 
-    title =
-        NSLocalizedString(@"Do you really want to quit X11?",
-                          @"Dialog title when quitting");
-    msg =
-        NSLocalizedString
-        (@"Any open X11 applications will stop immediately, and you will lose any unsaved changes.",
-         @"Dialog when quitting");
+    title = NSLocalizedString(@"Do you really want to quit X11?",
+                              @"Dialog title when quitting");
+    msg = NSLocalizedString(
+        @"Any open X11 applications will stop immediately, and you will lose any unsaved changes.",
+        @"Dialog when quitting");
 
     /* FIXME: safe to run the alert in here? Or should we return Later
      *        and then run the alert on a timer? It seems to work here, so..
@@ -821,9 +876,9 @@ NO])
             == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
 }
 
- -(void) applicationWillTerminate:(NSNotification *) aNotification {
+- (void) applicationWillTerminate:(NSNotification *)aNotification
+{
     unsigned remain;
-
     [X11App prefs_synchronize];
 
     /* shutdown the X server, it will exit () for us. */
@@ -831,20 +886,20 @@ NO])
 
     /* In case it doesn't, exit anyway after a while. */
     remain = 10000000;
-    while ((remain = usleep(remain)) > 0);
+    while ((remain = usleep(remain)) > 0) ;
 
     exit(1);
 }
 
--(void) server_ready {
+- (void) server_ready
+{
     x_list *node;
 
     finished_launching = YES;
 
     for (node = pending_apps; node != NULL; node = node->next) {
         NSString *filename = node->data;
-
- [self launch_client:filename];
+        [self launch_client:filename];
         [filename release];
     }
 
@@ -852,21 +907,22 @@ NO])
     pending_apps = NULL;
 }
 
- -(OSX_BOOL) application:(NSApplication *)
-app openFile:(NSString *) filename
+- (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename
 {
-    const char *name =[filename UTF8String];
+    const char *name = [filename UTF8String];
 
     if (finished_launching)
- [self launch_client:filename];
-    else if (name[0] != ':')    /* ignore display names */
-        pending_apps = x_list_prepend(pending_apps,[filename retain]);
+        [self launch_client:filename];
+    else if (name[0] != ':')            /* ignore display names */
+        pending_apps = x_list_prepend(pending_apps, [filename retain]);
 
     /* FIXME: report failures. */
     return YES;
 }
 
-@end void
+@end
+
+void
 X11ControllerMain(int argc, char **argv, char **envp)
 {
     X11ApplicationMain(argc, argv, envp);
diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index 70fb60a18..81db13ea9 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -1,29 +1,32 @@
-/**************************************************************************
-
-Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.
-Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
+/*
+ * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #include "sanitizedCarbon.h"
 
@@ -52,19 +55,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "X11Application.h"
 #include "protocol-versions.h"
 
-#define DEFINE_ATOM_HELPER(func,atom_name)                      \
-static Atom func (void) {                                       \
-    static int generation;                                      \
-    static Atom atom;                                           \
-    if (generation != serverGeneration) {                       \
-        generation = serverGeneration;                          \
-        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \
-    }                                                           \
-    return atom;                                                \
-}
+#define DEFINE_ATOM_HELPER(func, atom_name)                      \
+    static Atom func(void) {                                       \
+        static int generation;                                      \
+        static Atom atom;                                           \
+        if (generation != serverGeneration) {                       \
+            generation = serverGeneration;                          \
+            atom = MakeAtom(atom_name, strlen(atom_name), TRUE);  \
+        }                                                           \
+        return atom;                                                \
+    }
 
 DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
-    DEFINE_ATOM_HELPER(xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
+DEFINE_ATOM_HELPER(xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
 
 static AppleWMProcsPtr appleWMProcs;
 
@@ -73,7 +76,7 @@ static int WMErrorBase;
 static unsigned char WMReqCode = 0;
 static int WMEventBase = 0;
 
-static RESTYPE ClientType, EventType;   /* resource types for event masks */
+static RESTYPE ClientType, EventType; /* resource types for event masks */
 static XID eventResource;
 
 /* Currently selected events */
@@ -84,7 +87,7 @@ WMFreeClient(pointer data, XID id);
 static int
 WMFreeEvents(pointer data, XID id);
 static void
-SNotifyEvent(xAppleWMNotifyEvent * from, xAppleWMNotifyEvent * to);
+SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
 
 typedef struct _WMEvent *WMEventPtr;
 typedef struct _WMEvent {
@@ -98,7 +101,6 @@ static inline BoxRec
 make_box(int x, int y, int w, int h)
 {
     BoxRec r;
-
     r.x1 = x;
     r.y1 = y;
     r.x2 = x + w;
@@ -155,14 +157,14 @@ ProcAppleWMQueryVersion(register ClientPtr client)
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
     }
-    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *) &rep);
+    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
     return Success;
 }
-
+
 /* events */
 
 static inline void
-updateEventMask(WMEventPtr * pHead)
+updateEventMask(WMEventPtr *pHead)
 {
     WMEventPtr pCur;
 
@@ -171,18 +173,19 @@ updateEventMask(WMEventPtr * pHead)
         eventMask |= pCur->mask;
 }
 
- /*ARGSUSED*/ static int
+/*ARGSUSED*/
+static int
 WMFreeClient(pointer data, XID id)
 {
     WMEventPtr pEvent;
-    WMEventPtr *pHead, pCur, pPrev;
+    WMEventPtr   *pHead, pCur, pPrev;
     int i;
 
-    pEvent = (WMEventPtr) data;
-    i = dixLookupResourceByType((pointer *) &pHead, eventResource, EventType,
-                                serverClient,
-                                DixReadAccess | DixWriteAccess |
-                                DixDestroyAccess);
+    pEvent = (WMEventPtr)data;
+    i = dixLookupResourceByType(
+        (pointer *)&pHead, eventResource, EventType, serverClient,
+        DixReadAccess |
+        DixWriteAccess | DixDestroyAccess);
     if (i == Success && pHead) {
         pPrev = 0;
         for (pCur = *pHead; pCur && pCur != pEvent; pCur = pCur->next)
@@ -195,22 +198,23 @@ WMFreeClient(pointer data, XID id)
         }
         updateEventMask(pHead);
     }
-    free((pointer) pEvent);
+    free((pointer)pEvent);
     return 1;
 }
 
- /*ARGSUSED*/ static int
+/*ARGSUSED*/
+static int
 WMFreeEvents(pointer data, XID id)
 {
-    WMEventPtr *pHead, pCur, pNext;
+    WMEventPtr   *pHead, pCur, pNext;
 
-    pHead = (WMEventPtr *) data;
+    pHead = (WMEventPtr *)data;
     for (pCur = *pHead; pCur; pCur = pNext) {
         pNext = pCur->next;
         FreeResource(pCur->clientResource, ClientType);
-        free((pointer) pCur);
+        free((pointer)pCur);
     }
-    free((pointer) pHead);
+    free((pointer)pHead);
     eventMask = 0;
     return 1;
 }
@@ -224,8 +228,10 @@ ProcAppleWMSelectInput(register ClientPtr client)
     int i;
 
     REQUEST_SIZE_MATCH(xAppleWMSelectInputReq);
-    i = dixLookupResourceByType((pointer *) &pHead, eventResource, EventType,
-                                client, DixWriteAccess);
+    i =
+        dixLookupResourceByType((pointer *)&pHead, eventResource, EventType,
+                                client,
+                                DixWriteAccess);
     if (stuff->mask != 0) {
         if (i == Success && pHead) {
             /* check for existing entry. */
@@ -239,7 +245,7 @@ ProcAppleWMSelectInput(register ClientPtr client)
         }
 
         /* build the entry */
-        pNewEvent = (WMEventPtr) malloc(sizeof(WMEventRec));
+        pNewEvent = (WMEventPtr)malloc(sizeof(WMEventRec));
         if (!pNewEvent)
             return BadAlloc;
         pNewEvent->next = 0;
@@ -251,7 +257,7 @@ ProcAppleWMSelectInput(register ClientPtr client)
          */
         clientResource = FakeClientID(client->index);
         pNewEvent->clientResource = clientResource;
-        if (!AddResource(clientResource, ClientType, (pointer) pNewEvent))
+        if (!AddResource(clientResource, ClientType, (pointer)pNewEvent))
             return BadAlloc;
         /*
          * create a resource to contain a pointer to the list
@@ -260,9 +266,9 @@ ProcAppleWMSelectInput(register ClientPtr client)
          * done through the resource database.
          */
         if (i != Success || !pHead) {
-            pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
+            pHead = (WMEventPtr *)malloc(sizeof(WMEventPtr));
             if (!pHead ||
-                !AddResource(eventResource, EventType, (pointer) pHead)) {
+                !AddResource(eventResource, EventType, (pointer)pHead)) {
                 FreeResource(clientResource, RT_NONE);
                 return BadAlloc;
             }
@@ -306,12 +312,14 @@ ProcAppleWMSelectInput(register ClientPtr client)
 void
 AppleWMSendEvent(int type, unsigned int mask, int which, int arg)
 {
-    WMEventPtr *pHead, pEvent;
+    WMEventPtr      *pHead, pEvent;
     xAppleWMNotifyEvent se;
     int i;
 
-    i = dixLookupResourceByType((pointer *) &pHead, eventResource, EventType,
-                                serverClient, DixReadAccess);
+    i =
+        dixLookupResourceByType((pointer *)&pHead, eventResource, EventType,
+                                serverClient,
+                                DixReadAccess);
     if (i != Success || !pHead)
         return;
     for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
@@ -321,7 +329,7 @@ AppleWMSendEvent(int type, unsigned int mask, int which, int arg)
         se.kind = which;
         se.arg = arg;
         se.time = currentTime.milliseconds;
-        WriteEventsToClient(pEvent->client, 1, (xEvent *) &se);
+        WriteEventsToClient(pEvent->client, 1, (xEvent *)&se);
     }
 }
 
@@ -331,7 +339,7 @@ AppleWMSelectedEvents(void)
 {
     return eventMask;
 }
-
+
 /* general utility functions */
 
 static int
@@ -353,7 +361,7 @@ ProcAppleWMReenableUpdate(register ClientPtr client)
 
     return Success;
 }
-
+
 /* window functions */
 
 static int
@@ -362,7 +370,6 @@ ProcAppleWMSetWindowMenu(register ClientPtr client)
     const char *bytes, **items;
     char *shortcuts;
     int max_len, nitems, i, j;
-
     REQUEST(xAppleWMSetWindowMenuReq);
 
     REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);
@@ -372,13 +379,14 @@ ProcAppleWMSetWindowMenu(register ClientPtr client)
     shortcuts = malloc(sizeof(char) * nitems);
 
     max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
-    bytes = (char *) &stuff[1];
+    bytes = (char *)&stuff[1];
 
     for (i = j = 0; i < max_len && j < nitems;) {
         shortcuts[j] = bytes[i++];
         items[j++] = bytes + i;
 
-        while (i < max_len) {
+        while (i < max_len)
+        {
             if (bytes[i++] == 0)
                 break;
         }
@@ -418,7 +426,8 @@ ProcAppleWMSetWindowLevel(register ClientPtr client)
 
     REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
 
-    if (Success != dixLookupWindow(&pWin, stuff->window, client, DixReadAccess))
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+                                   DixReadAccess))
         return BadValue;
 
     if (stuff->level >= AppleWMNumWindowLevels) {
@@ -456,7 +465,6 @@ static int
 ProcAppleWMAttachTransient(register ClientPtr client)
 {
     WindowPtr pWinChild, pWinParent;
-
     REQUEST(xAppleWMAttachTransientReq);
     int err;
 
@@ -496,7 +504,7 @@ ProcAppleWMSetCanQuit(register ClientPtr client)
     X11ApplicationSetCanQuit(stuff->state);
     return Success;
 }
-
+
 /* frame functions */
 
 static int
@@ -504,7 +512,6 @@ ProcAppleWMFrameGetRect(register ClientPtr client)
 {
     xAppleWMFrameGetRectReply rep;
     BoxRec ir, or, rr;
-
     REQUEST(xAppleWMFrameGetRectReq);
 
     REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);
@@ -526,7 +533,7 @@ ProcAppleWMFrameGetRect(register ClientPtr client)
     rep.w = rr.x2 - rr.x1;
     rep.h = rr.y2 - rr.y1;
 
-    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *) &rep);
+    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
     return Success;
 }
 
@@ -536,7 +543,6 @@ ProcAppleWMFrameHitTest(register ClientPtr client)
     xAppleWMFrameHitTestReply rep;
     BoxRec ir, or;
     int ret;
-
     REQUEST(xAppleWMFrameHitTestReq);
 
     REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);
@@ -554,7 +560,7 @@ ProcAppleWMFrameHitTest(register ClientPtr client)
 
     rep.ret = ret;
 
-    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *) &rep);
+    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
     return Success;
 }
 
@@ -564,13 +570,13 @@ ProcAppleWMFrameDraw(register ClientPtr client)
     BoxRec ir, or;
     unsigned int title_length, title_max;
     unsigned char *title_bytes;
-
     REQUEST(xAppleWMFrameDrawReq);
     WindowPtr pWin;
 
     REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);
 
-    if (Success != dixLookupWindow(&pWin, stuff->window, client, DixReadAccess))
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+                                   DixReadAccess))
         return BadValue;
 
     ir = make_box(stuff->ix, stuff->iy, stuff->iw, stuff->ih);
@@ -582,7 +588,7 @@ ProcAppleWMFrameDraw(register ClientPtr client)
     if (title_max < title_length)
         return BadValue;
 
-    title_bytes = (unsigned char *) &stuff[1];
+    title_bytes = (unsigned char *)&stuff[1];
 
     errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,
                                     stuff->frame_attr, &or, &ir,
@@ -593,7 +599,7 @@ ProcAppleWMFrameDraw(register ClientPtr client)
 
     return Success;
 }
-
+
 /* dispatch */
 
 static int
@@ -612,37 +618,50 @@ ProcAppleWMDispatch(register ClientPtr client)
     switch (stuff->data) {
     case X_AppleWMSelectInput:
         return ProcAppleWMSelectInput(client);
+
     case X_AppleWMDisableUpdate:
         return ProcAppleWMDisableUpdate(client);
+
     case X_AppleWMReenableUpdate:
         return ProcAppleWMReenableUpdate(client);
+
     case X_AppleWMSetWindowMenu:
         return ProcAppleWMSetWindowMenu(client);
+
     case X_AppleWMSetWindowMenuCheck:
         return ProcAppleWMSetWindowMenuCheck(client);
+
     case X_AppleWMSetFrontProcess:
         return ProcAppleWMSetFrontProcess(client);
+
     case X_AppleWMSetWindowLevel:
         return ProcAppleWMSetWindowLevel(client);
+
     case X_AppleWMSetCanQuit:
         return ProcAppleWMSetCanQuit(client);
+
     case X_AppleWMFrameGetRect:
         return ProcAppleWMFrameGetRect(client);
+
     case X_AppleWMFrameHitTest:
         return ProcAppleWMFrameHitTest(client);
+
     case X_AppleWMFrameDraw:
         return ProcAppleWMFrameDraw(client);
+
     case X_AppleWMSendPSN:
         return ProcAppleWMSendPSN(client);
+
     case X_AppleWMAttachTransient:
         return ProcAppleWMAttachTransient(client);
+
     default:
         return BadRequest;
     }
 }
 
 static void
-SNotifyEvent(xAppleWMNotifyEvent * from, xAppleWMNotifyEvent * to)
+SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to)
 {
     to->type = from->type;
     to->kind = from->kind;
@@ -672,6 +691,7 @@ SProcAppleWMDispatch(register ClientPtr client)
     switch (stuff->data) {
     case X_AppleWMQueryVersion:
         return SProcAppleWMQueryVersion(client);
+
     default:
         return BadRequest;
     }
@@ -680,7 +700,7 @@ SProcAppleWMDispatch(register ClientPtr client)
 void
 AppleWMExtensionInit(AppleWMProcsPtr procsPtr)
 {
-    ExtensionEntry *extEntry;
+    ExtensionEntry* extEntry;
 
     ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
     EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
@@ -692,14 +712,14 @@ AppleWMExtensionInit(AppleWMProcsPtr procsPtr)
                                  AppleWMNumberErrors,
                                  ProcAppleWMDispatch,
                                  SProcAppleWMDispatch,
-                                 NULL, StandardMinorOpcode))) {
+                                 NULL,
+                                 StandardMinorOpcode))) {
         size_t i;
-
-        WMReqCode = (unsigned char) extEntry->base;
+        WMReqCode = (unsigned char)extEntry->base;
         WMErrorBase = extEntry->errorBase;
         WMEventBase = extEntry->eventBase;
         for (i = 0; i < AppleWMNumberEvents; i++)
-            EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
+            EventSwapVector[WMEventBase + i] = (EventSwapPtr)SNotifyEvent;
         appleWMProcs = procsPtr;
     }
 }
diff --git a/xorg-server/hw/xquartz/applewmExt.h b/xorg-server/hw/xquartz/applewmExt.h
index 2ad9f45b9..14c77214a 100644
--- a/xorg-server/hw/xquartz/applewmExt.h
+++ b/xorg-server/hw/xquartz/applewmExt.h
@@ -1,32 +1,33 @@
-/*
- * External interface for the server's AppleWM support
+/* External interface for the server's AppleWM support
+ *
+ * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
  */
-/**************************************************************************
-
-Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
-Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
 
 #ifndef _APPLEWMEXT_H_
 #define _APPLEWMEXT_H_
@@ -40,21 +41,22 @@ typedef int xp_frame_class;
 typedef int xp_frame_rect;
 #endif
 
-typedef int (*DisableUpdateProc) (void);
-typedef int (*EnableUpdateProc) (void);
-typedef int (*SetWindowLevelProc) (WindowPtr pWin, int level);
-typedef int (*FrameGetRectProc) (xp_frame_rect type, xp_frame_class class,
-                                 const BoxRec * outer, const BoxRec * inner,
-                                 BoxRec * ret);
-typedef int (*FrameHitTestProc) (xp_frame_class class, int x, int y,
-                                 const BoxRec * outer, const BoxRec * inner,
-                                 int *ret);
-typedef int (*FrameDrawProc) (WindowPtr pWin, xp_frame_class class,
-                              xp_frame_attr attr, const BoxRec * outer,
-                              const BoxRec * inner, unsigned int title_len,
-                              const unsigned char *title_bytes);
-typedef int (*SendPSNProc) (uint32_t hi, uint32_t lo);
-typedef int (*AttachTransientProc) (WindowPtr pWinChild, WindowPtr pWinParent);
+typedef int (*DisableUpdateProc)(void);
+typedef int (*EnableUpdateProc)(void);
+typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);
+typedef int (*FrameGetRectProc)(xp_frame_rect type, xp_frame_class class,
+                                const BoxRec *outer,
+                                const BoxRec *inner, BoxRec *ret);
+typedef int (*FrameHitTestProc)(xp_frame_class class, int x, int y,
+                                const BoxRec *outer,
+                                const BoxRec *inner, int *ret);
+typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class,
+                             xp_frame_attr attr,
+                             const BoxRec *outer, const BoxRec *inner,
+                             unsigned int title_len,
+                             const unsigned char *title_bytes);
+typedef int (*SendPSNProc)(uint32_t hi, uint32_t lo);
+typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);
 
 /*
  * AppleWM implementation function list
@@ -70,19 +72,21 @@ typedef struct _AppleWMProcs {
     AttachTransientProc AttachTransient;
 } AppleWMProcsRec, *AppleWMProcsPtr;
 
-void AppleWMExtensionInit(AppleWMProcsPtr procsPtr);
+void
+AppleWMExtensionInit(AppleWMProcsPtr procsPtr);
 
-void AppleWMSetScreenOrigin(WindowPtr pWin);
+void
+AppleWMSetScreenOrigin(WindowPtr pWin);
 
-Bool AppleWMDoReorderWindow(WindowPtr pWin);
+Bool
+AppleWMDoReorderWindow(WindowPtr pWin);
 
-void AppleWMSendEvent(int /* type */ ,
-                      unsigned int /* mask */ ,
-                      int /* which */ ,
-                      int       /* arg */
-    );
+void
+AppleWMSendEvent(int /* type */, unsigned int /* mask */, int /* which */,
+                 int                  /* arg */
+                 );
 
-unsigned int AppleWMSelectedEvents(void
-    );
+unsigned int
+AppleWMSelectedEvents(void);
 
-#endif                          /* _APPLEWMEXT_H_ */
+#endif /* _APPLEWMEXT_H_ */
diff --git a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
index bf2089ca1..36ae0ffb3 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
+++ b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
diff --git a/xorg-server/hw/xquartz/console_redirect.c b/xorg-server/hw/xquartz/console_redirect.c
index 0f96a9512..7b92eca39 100644
--- a/xorg-server/hw/xquartz/console_redirect.c
+++ b/xorg-server/hw/xquartz/console_redirect.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2011 Apple Inc.
+/*
+ * Copyright (c) 2011-2012 Apple Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -30,7 +31,7 @@
 #include <dix-config.h>
 #else
 #define DEBUG_CONSOLE_REDIRECT 1
-#define HAVE_LIBDISPATCH 1
+#define HAVE_LIBDISPATCH       1
 #endif
 
 #include <assert.h>
@@ -102,7 +103,8 @@ _read_redirect(int fd, int flush)
     asl_redirect *aslr = &redirect_fds[fd];
 
     while ((nbytes =
-            read(fd, aslr->w, BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {
+                read(fd, aslr->w,
+                     BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {
         char *s, *p;
 
         /* Increment our returned number read */
@@ -114,7 +116,7 @@ _read_redirect(int fd, int flush)
         /* One line at a time */
         for (p = aslr->buf; *p && (p - aslr->buf) < nbytes; p = s + 1) {
             // Find null or \n
-            for (s = p; *s && *s != '\n'; s++);
+            for (s = p; *s && *s != '\n'; s++) ;
             if (*s == '\n') {
                 *s = '\0';
                 asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p);
@@ -149,9 +151,8 @@ _read_redirect(int fd, int flush)
 static void
 read_from_source(void *_source)
 {
-    dispatch_source_t source = (dispatch_source_t) _source;
+    dispatch_source_t source = (dispatch_source_t)_source;
     int fd = dispatch_source_get_handle(source);
-
     if (_read_redirect(fd, 0) == EOF) {
         dispatch_source_cancel(source);
     }
@@ -160,7 +161,7 @@ read_from_source(void *_source)
 static void
 cancel_source(void *_source)
 {
-    dispatch_source_t source = (dispatch_source_t) _source;
+    dispatch_source_t source = (dispatch_source_t)_source;
     int fd = dispatch_source_get_handle(source);
     asl_redirect *aslr = &redirect_fds[fd];
 
@@ -174,7 +175,7 @@ cancel_source(void *_source)
     dispatch_group_leave(read_source_group);
 }
 
-#else                           /* !HAVE_LIBDISPATCH */
+#else /* !HAVE_LIBDISPATCH */
 static void *
 redirect_thread(void *ctx __unused)
 {
@@ -205,16 +206,18 @@ redirect_thread(void *ctx __unused)
 
                 if (fd < 0 || fd >= n_redirect_fds || aslr->buf == NULL) {
                     asl_log(NULL, NULL, ASL_LEVEL_ERR,
-                            "Unexpected file descriptor: %d", fd);
+                            "Unexpected file descriptor: %d",
+                            fd);
                     goto next;
                 }
 
                 if (ev.flags & EV_EOF) {
                     close_fd = 1;
                     if (EOF != _read_redirect(fd, 1)) {
-                        asl_log(NULL, NULL, ASL_LEVEL_ERR,
-                                "kevent reported EOF on %d, but read doesn't concur.",
-                                fd);
+                        asl_log(
+                            NULL, NULL, ASL_LEVEL_ERR,
+                            "kevent reported EOF on %d, but read doesn't concur.",
+                            fd);
                     }
                 }
                 else {
@@ -229,7 +232,7 @@ redirect_thread(void *ctx __unused)
                     memset(aslr, 0, sizeof(*aslr));
                 }
             }
- next:
+next:
             pthread_mutex_unlock(&redirect_fds_lock);
 
         case EVFILT_TIMER:
@@ -237,7 +240,8 @@ redirect_thread(void *ctx __unused)
                 return NULL;
 
         default:
-            ;;
+            ;
+            ;
         }
     }
 
@@ -263,8 +267,8 @@ redirect_atexit(void)
 
         /* Wait at least three seconds for our sources to flush to ASL */
         dispatch_group_wait(read_source_group,
-                            dispatch_time(DISPATCH_TIME_NOW,
-                                          3LL * NSEC_PER_SEC));
+                            dispatch_time(DISPATCH_TIME_NOW, 3LL *
+                                          NSEC_PER_SEC));
     }
 #else
     {
@@ -299,7 +303,8 @@ xq_asl_init(void)
     assert(read_source_group != NULL);
 #else
     assert((kq = kqueue()) != -1);
-    assert(pthread_create(&redirect_pthread, NULL, redirect_thread, NULL) == 0);
+    assert(pthread_create(&redirect_pthread, NULL, redirect_thread,
+                          NULL) == 0);
 #endif
 
     atexit(redirect_atexit);
@@ -311,12 +316,10 @@ xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd)
 #ifdef HAVE_LIBDISPATCH
     int err __block = 0;
     static dispatch_once_t once_control;
-
     dispatch_once_f(&once_control, NULL, xq_asl_init);
 #else
     int err = 0;
     static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-
     assert(pthread_once(&once_control, xq_asl_init) == 0);
 #endif
 
@@ -330,70 +333,75 @@ xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd)
 #define BLOCK_DONE goto done
     assert(pthread_mutex_lock(&redirect_fds_lock) == 0);
 #endif
-    {
-        /* Reallocate if we need more space */
-        if (fd >= n_redirect_fds) {
-            size_t new_n = 1 << (ffs(fd) + 1);
-            asl_redirect *new_array =
-                realloc(redirect_fds, new_n * sizeof(*redirect_fds));
-            if (!new_array) {
-                err = errno;
-                BLOCK_DONE;
-            }
-            redirect_fds = new_array;
-            memset(redirect_fds + n_redirect_fds, 0, new_n - n_redirect_fds);
-            n_redirect_fds = new_n;
-        }
-
-        /* If we're already listening on it, return error. */
-        if (redirect_fds[fd].buf != NULL) {
-            err = EBADF;
-            BLOCK_DONE;
-        }
-
-        /* Initialize our buffer */
-        redirect_fds[fd].buf = (char *) malloc(BUF_SIZE);
-        if (redirect_fds[fd].buf == NULL) {
-            err = errno;
-            BLOCK_DONE;
-        }
-        redirect_fds[fd].w = redirect_fds[fd].buf;
-
-        /* Store our ASL settings */
-        redirect_fds[fd].level = level;
-        redirect_fds[fd].asl = asl;
-        redirect_fds[fd].msg = msg;
-
-        /* Don't block on reads from this fd */
-        fcntl(fd, F_SETFL, O_NONBLOCK);
-
-        /* Start listening */
+                  {
+                      /* Reallocate if we need more space */
+                      if (fd >= n_redirect_fds) {
+                          size_t new_n = 1 << (ffs(fd) + 1);
+                          asl_redirect *new_array =
+                              realloc(redirect_fds, new_n *
+                                      sizeof(*redirect_fds));
+                          if (!new_array) {
+                              err = errno;
+                              BLOCK_DONE;
+                          }
+                          redirect_fds = new_array;
+                          memset(redirect_fds + n_redirect_fds, 0, new_n -
+                                 n_redirect_fds);
+                          n_redirect_fds = new_n;
+                      }
+
+                      /* If we're already listening on it, return error. */
+                      if (redirect_fds[fd].buf != NULL) {
+                          err = EBADF;
+                          BLOCK_DONE;
+                      }
+
+                      /* Initialize our buffer */
+                      redirect_fds[fd].buf = (char *)malloc(BUF_SIZE);
+                      if (redirect_fds[fd].buf == NULL) {
+                          err = errno;
+                          BLOCK_DONE;
+                      }
+                      redirect_fds[fd].w = redirect_fds[fd].buf;
+
+                      /* Store our ASL settings */
+                      redirect_fds[fd].level = level;
+                      redirect_fds[fd].asl = asl;
+                      redirect_fds[fd].msg = msg;
+
+                      /* Don't block on reads from this fd */
+                      fcntl(fd, F_SETFL,
+                            O_NONBLOCK);
+
+                      /* Start listening */
 #ifdef HAVE_LIBDISPATCH
-        {
-            dispatch_source_t read_source =
-                dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fd, 0,
-                                       redirect_serial_q);
-            redirect_fds[fd].read_source = read_source;
-            dispatch_set_context(read_source, read_source);
-            dispatch_source_set_event_handler_f(read_source, read_from_source);
-            dispatch_source_set_cancel_handler_f(read_source, cancel_source);
-            dispatch_group_enter(read_source_group);
-            dispatch_resume(read_source);
-        }
+                      {
+                          dispatch_source_t read_source =
+                              dispatch_source_create(
+                                  DISPATCH_SOURCE_TYPE_READ, fd, 0,
+                                  redirect_serial_q);
+                          redirect_fds[fd].read_source = read_source;
+                          dispatch_set_context(read_source, read_source);
+                          dispatch_source_set_event_handler_f(read_source,
+                                                              read_from_source);
+                          dispatch_source_set_cancel_handler_f(read_source,
+                                                               cancel_source);
+                          dispatch_group_enter(read_source_group);
+                          dispatch_resume(read_source);
+                      }
 #else
-        {
-            struct kevent ev;
-
-            EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
-            kevent(kq, &ev, 1, NULL, 0, NULL);
-        }
+                      {
+                          struct kevent ev;
+                          EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, 0);
+                          kevent(kq, &ev, 1, NULL, 0, NULL);
+                      }
 #endif
-    }
+                  }
 #ifdef HAVE_LIBDISPATCH
-    );
+                  );
 #else
- done:
-    assert(pthread_mutex_unlock(&redirect_fds_lock) == 0);
+done:
+                  assert(pthread_mutex_unlock(&redirect_fds_lock) == 0);
 #endif
 #undef BLOCK_DONE
 
@@ -433,7 +441,7 @@ xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd)
 
 #ifdef DEBUG_CONSOLE_REDIRECT
 int
-main(int argc __unused, char **argv __unused)
+main(int argc __unused, char * *argv __unused)
 {
     xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO);
     xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_ERR, STDERR_FILENO);
diff --git a/xorg-server/hw/xquartz/console_redirect.h b/xorg-server/hw/xquartz/console_redirect.h
index 94520a35c..7b80de405 100644
--- a/xorg-server/hw/xquartz/console_redirect.h
+++ b/xorg-server/hw/xquartz/console_redirect.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Apple Inc.
+/* Copyright (c) 2011-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -34,11 +34,13 @@
 /* The given fd is replaced with a pipe.  Anything written to it will will be
  * logged to ASL.
  */
-int xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd);
+int
+xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd);
 
 /* The given fd is read from and passed along to ASL until all write ends of the
  * pipe are closed. Once the last writer has closed the pipe, we close our end.
  */
-int xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd);
+int
+xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd);
 
 #endif
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index a0ce377b1..2e0bfe6da 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -2,7 +2,7 @@
  *
  * Xquartz initialization code
  *
- * Copyright (c) 2007-2008 Apple Inc.
+ * Copyright (c) 2007-2012 Apple Inc.
  * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -56,6 +56,7 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 #include <sys/syslimits.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -77,11 +78,14 @@
 #include "quartzKeyboard.h"
 #include "quartz.h"
 
+#include "X11Application.h"
+
 aslclient aslc;
 
 void
 xq_asl_log(int level, const char *subsystem, const char *file,
-           const char *function, int line, const char *fmt, ...)
+           const char *function, int line, const char *fmt,
+           ...)
 {
     va_list args;
     aslmsg msg = asl_new(ASL_TYPE_MSG);
@@ -116,7 +120,6 @@ DevPrivateKeyRec darwinScreenKeyRec;
 io_connect_t darwinParamConnect = 0;
 int darwinEventReadFD = -1;
 int darwinEventWriteFD = -1;
-
 // int                     darwinMouseAccelChange = 1;
 int darwinFakeButtons = 0;
 
@@ -138,7 +141,7 @@ int darwinFakeMouse3Mask = NX_COMMANDMASK;
 #endif
 
 // Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu
-unsigned int darwinAppKitModMask = 0;   // Any of these bits
+unsigned int darwinAppKitModMask = 0;            // Any of these bits
 
 // Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)
 unsigned int windowItemModMask = NX_COMMANDMASK;
@@ -152,15 +155,14 @@ DeviceIntPtr darwinTabletEraser = NULL;
 
 // Common pixmap formats
 static PixmapFormatRec formats[] = {
-    {1, 1, BITMAP_SCANLINE_PAD},
-    {4, 8, BITMAP_SCANLINE_PAD},
-    {8, 8, BITMAP_SCANLINE_PAD},
-    {15, 16, BITMAP_SCANLINE_PAD},
-    {16, 16, BITMAP_SCANLINE_PAD},
-    {24, 32, BITMAP_SCANLINE_PAD},
-    {32, 32, BITMAP_SCANLINE_PAD}
+    { 1,  1,  BITMAP_SCANLINE_PAD    },
+    { 4,  8,  BITMAP_SCANLINE_PAD    },
+    { 8,  8,  BITMAP_SCANLINE_PAD    },
+    { 15, 16, BITMAP_SCANLINE_PAD    },
+    { 16, 16, BITMAP_SCANLINE_PAD    },
+    { 24, 32, BITMAP_SCANLINE_PAD    },
+    { 32, 32, BITMAP_SCANLINE_PAD    }
 };
-
 const int NUMFORMATS = sizeof(formats) / sizeof(formats[0]);
 
 void
@@ -179,12 +181,9 @@ static Bool
 DarwinSaveScreen(ScreenPtr pScreen, int on)
 {
     // FIXME
-    if (on == SCREEN_SAVER_FORCER) {
-    }
-    else if (on == SCREEN_SAVER_ON) {
-    }
-    else {
-    }
+    if (on == SCREEN_SAVER_FORCER) {}
+    else if (on == SCREEN_SAVER_ON) {}
+    else {}
     return TRUE;
 }
 
@@ -231,16 +230,18 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
         return FALSE;
     }
 
-// TODO: Make PseudoColor visuals not suck in TrueColor mode  
-//    if(dfb->depth > 8)
-//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+    // TODO: Make PseudoColor visuals not suck in TrueColor mode
+    //    if(dfb->depth > 8)
+    //        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
     if (dfb->depth > 15)
         miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor,
-                                 RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5, 5),
+                                 RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5,
+                                                              5),
                                  BM_ARGB(0, 5, 5, 5));
     if (dfb->depth > 24)
         miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor,
-                                 RM_ARGB(0, 8, 8, 8), GM_ARGB(0, 8, 8, 8),
+                                 RM_ARGB(0, 8, 8, 8), GM_ARGB(0, 8, 8,
+                                                              8),
                                  BM_ARGB(0, 8, 8, 8));
 
     miSetPixmapDepths();
@@ -253,12 +254,12 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
         dpi = 96;
 
     // initialize fb
-    if (!fbScreenInit(pScreen, dfb->framebuffer,        // pointer to screen bitmap
-                      dfb->width, dfb->height,  // screen size in pixels
-                      dpi, dpi, // dots per inch
-                      dfb->pitch / (dfb->bitsPerPixel / 8),     // pixel width of framebuffer
-                      dfb->bitsPerPixel))       // bits per pixel for screen
-    {
+    if (!fbScreenInit(pScreen,
+                      dfb->framebuffer,                  // pointer to screen bitmap
+                      dfb->width, dfb->height,           // screen size in pixels
+                      dpi, dpi,                          // dots per inch
+                      dfb->pitch / (dfb->bitsPerPixel / 8), // pixel width of framebuffer
+                      dfb->bitsPerPixel)) {              // bits per pixel for screen
         return FALSE;
     }
 
@@ -294,12 +295,12 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 }
 
 /*
- =============================================================================
+   =============================================================================
 
- mouse and keyboard callbacks
+   mouse and keyboard callbacks
 
- =============================================================================
-*/
+   =============================================================================
+ */
 
 /*
  * DarwinMouseProc: Handle the initialization, etc. of a mouse
@@ -307,10 +308,10 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 static int
 DarwinMouseProc(DeviceIntPtr pPointer, int what)
 {
-#define NBUTTONS 7
-#define NAXES 2
-    // 7 buttons: left, right, middle, then four scroll wheel "buttons"
-    CARD8 map[NBUTTONS + 1] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+#define NBUTTONS 3
+#define NAXES    4
+    // 3 buttons: left, middle, right
+    CARD8 map[NBUTTONS + 1] = { 0, 1, 2, 3};
     Atom btn_labels[NBUTTONS] = { 0 };
     Atom axes_labels[NAXES] = { 0 };
 
@@ -321,28 +322,40 @@ DarwinMouseProc(DeviceIntPtr pPointer, int what)
         btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
         btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
         btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-        btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-        btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-        btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
-        btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
 
         axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
         axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+        axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_WHEEL);
+        axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_HWHEEL);
 
         // Set button map.
-        InitPointerDeviceStruct((DevicePtr) pPointer, map, NBUTTONS,
+        InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
                                 btn_labels,
-                                (PtrCtrlProcPtr) NoopDDA,
-                                GetMotionHistorySize(), NAXES, axes_labels);
-        InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS,
-                               NO_AXIS_LIMITS, 0, 0, 0, Absolute);
-        InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS,
-                               NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+                                (PtrCtrlProcPtr)NoopDDA,
+                                GetMotionHistorySize(), NAXES,
+                                axes_labels);
+        InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 
+                               NO_AXIS_LIMITS, NO_AXIS_LIMITS,
+                               1, 0, 1, Relative);
+        InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 
+                               NO_AXIS_LIMITS, NO_AXIS_LIMITS,
+                               1, 0, 1, Relative);
+        InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 
+                               NO_AXIS_LIMITS, NO_AXIS_LIMITS,
+                               1, 0, 1, Relative);
+        InitValuatorAxisStruct(pPointer, 3, axes_labels[3], 
+                               NO_AXIS_LIMITS, NO_AXIS_LIMITS,
+                               1, 0, 1, Relative);
+
+        SetScrollValuator(pPointer, 2, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_PREFERRED);
+        SetScrollValuator(pPointer, 3, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
         break;
+
     case DEVICE_ON:
         pPointer->public.on = TRUE;
         AddEnabledDevice(darwinEventReadFD);
         return Success;
+
     case DEVICE_CLOSE:
     case DEVICE_OFF:
         pPointer->public.on = FALSE;
@@ -359,7 +372,7 @@ static int
 DarwinTabletProc(DeviceIntPtr pPointer, int what)
 {
 #define NBUTTONS 3
-#define NAXES 5
+#define NAXES    5
     CARD8 map[NBUTTONS + 1] = { 0, 1, 2, 3 };
     Atom btn_labels[NBUTTONS] = { 0 };
     Atom axes_labels[NAXES] = { 0 };
@@ -379,30 +392,38 @@ DarwinTabletProc(DeviceIntPtr pPointer, int what)
         axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
 
         // Set button map.
-        InitPointerDeviceStruct((DevicePtr) pPointer, map, NBUTTONS,
+        InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
                                 btn_labels,
-                                (PtrCtrlProcPtr) NoopDDA,
-                                GetMotionHistorySize(), NAXES, axes_labels);
+                                (PtrCtrlProcPtr)NoopDDA,
+                                GetMotionHistorySize(), NAXES,
+                                axes_labels);
         InitProximityClassDeviceStruct(pPointer);
 
         InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0,
-                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1,
+                               Absolute);
         InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0,
-                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1,
+                               Absolute);
         InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0,
-                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1,
+                               Absolute);
         InitValuatorAxisStruct(pPointer, 3, axes_labels[3],
-                               -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT,
-                               1, 0, 1, Absolute);
+                               -XQUARTZ_VALUATOR_LIMIT,
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1,
+                               Absolute);
         InitValuatorAxisStruct(pPointer, 4, axes_labels[4],
-                               -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT,
-                               1, 0, 1, Absolute);
-//          pPointer->use = IsXExtensionDevice;
+                               -XQUARTZ_VALUATOR_LIMIT,
+                               XQUARTZ_VALUATOR_LIMIT, 1, 0, 1,
+                               Absolute);
+        //          pPointer->use = IsXExtensionDevice;
         break;
+
     case DEVICE_ON:
         pPointer->public.on = TRUE;
         AddEnabledDevice(darwinEventReadFD);
         return Success;
+
     case DEVICE_CLOSE:
     case DEVICE_OFF:
         pPointer->public.on = FALSE;
@@ -425,14 +446,17 @@ DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
     case DEVICE_INIT:
         DarwinKeyboardInit(pDev);
         break;
+
     case DEVICE_ON:
         pDev->public.on = TRUE;
         AddEnabledDevice(darwinEventReadFD);
         break;
+
     case DEVICE_OFF:
         pDev->public.on = FALSE;
         RemoveEnabledDevice(darwinEventReadFD);
         break;
+
     case DEVICE_CLOSE:
         break;
     }
@@ -441,12 +465,12 @@ DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
 }
 
 /*
-===========================================================================
+   ===========================================================================
 
- Utility routines
+   Utility routines
 
-===========================================================================
-*/
+   ===========================================================================
+ */
 
 /*
  * DarwinParseModifierList
@@ -464,7 +488,7 @@ DarwinParseModifierList(const char *constmodifiers, int separatelr)
         char *p = modifiers;
 
         while (p) {
-            modifier = strsep(&p, " ,+&|/");    // allow lots of separators
+            modifier = strsep(&p, " ,+&|/"); // allow lots of separators
             nxkey = DarwinModifierStringToNXMask(modifier, separatelr);
             if (nxkey)
                 result |= nxkey;
@@ -477,12 +501,12 @@ DarwinParseModifierList(const char *constmodifiers, int separatelr)
 }
 
 /*
-===========================================================================
+   ===========================================================================
 
- Functions needed to link against device independent X
+   Functions needed to link against device independent X
 
-===========================================================================
-*/
+   ===========================================================================
+ */
 
 /*
  * InitInput
@@ -491,14 +515,17 @@ DarwinParseModifierList(const char *constmodifiers, int separatelr)
 void
 InitInput(int argc, char **argv)
 {
-    XkbRMLVOSet rmlvo = {.rules = "base",.model = "empty",.layout = "empty",
-        .variant = NULL,.options = NULL
+    XkbRMLVOSet rmlvo = {
+        .rules   = "base", .model         = "empty", .layout = "empty",
+        .variant = NULL,   .options       = NULL
     };
+
     /* We need to really have rules... or something... */
     XkbSetRulesDflts(&rmlvo);
 
-    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
-    darwinKeyboard->name = strdup("keyboard");
+    assert(Success == AllocDevicePair(serverClient, "xquartz virtual",
+                                      &darwinPointer, &darwinKeyboard,
+                                      DarwinMouseProc, DarwinKeybdProc, FALSE));
 
     /* here's the snippet from the current gdk sources:
        if (!strcmp (tmp_name, "pointer"))
@@ -514,16 +541,16 @@ InitInput(int argc, char **argv)
        gdkdev->info.source = GDK_SOURCE_PEN;
      */
 
-    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);
-    darwinPointer->name = strdup("pointer");
-
-    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, FALSE);
+    assert(darwinTabletStylus);
     darwinTabletStylus->name = strdup("pen");
 
-    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, FALSE);
+    assert(darwinTabletCursor);
     darwinTabletCursor->name = strdup("cursor");
 
-    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, FALSE);
+    assert(darwinTabletEraser);
     darwinTabletEraser->name = strdup("eraser");
 
     DarwinEQInit();
@@ -552,7 +579,7 @@ CloseInput(void)
  *  easier target to hit.
  */
 void
-DarwinAdjustScreenOrigins(ScreenInfo * pScreenInfo)
+DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
 {
     int i, left, top;
 
@@ -588,6 +615,9 @@ DarwinAdjustScreenOrigins(ScreenInfo * pScreenInfo)
                       pScreenInfo->screens[i]->y);
         }
     }
+
+    /* Update screenInfo.x/y */
+    update_desktop_dimensions();
 }
 
 /*
@@ -604,7 +634,7 @@ DarwinAdjustScreenOrigins(ScreenInfo * pScreenInfo)
  *  SetupScreen function can be called to finalize screen setup.
  */
 void
-InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 {
     int i;
 
@@ -633,9 +663,9 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
  * OsVendorFatalError
  */
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
-    ErrorF("   OsVendorFatalError\n");
+    X11ApplicationFatalError(f, args);
 }
 
 /*
@@ -648,10 +678,17 @@ OsVendorInit(void)
     if (serverGeneration == 1) {
         char *lf;
         char *home = getenv("HOME");
-
         assert(home);
+        assert(0 < asprintf(&lf, "%s/Library/Logs/X11", home));
+
+        /* Ignore errors.  If EEXIST, we don't care.  If anything else,
+         * LogInit will handle it for us.
+         */
+        (void)mkdir(lf, S_IRWXU | S_IRWXG | S_IRWXO);
+        free(lf);
+
         assert(0 <
-               asprintf(&lf, "%s/Library/Logs/%s.X11.log", home,
+               asprintf(&lf, "%s/Library/Logs/X11/%s.log", home,
                         bundle_id_prefix));
         LogInit(lf, ".old");
         free(lf);
@@ -660,15 +697,14 @@ OsVendorInit(void)
 #ifdef ENABLE_DEBUG_LOG
         {
             char *home_dir = NULL, *log_file_path = NULL;
-
             home_dir = getenv("HOME");
-            if (home_dir)
-                asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);
+            if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir,
+                                   DEBUG_LOG_NAME);
             if (log_file_path) {
                 if (!access(log_file_path, F_OK)) {
                     debug_log_fp = fopen(log_file_path, "a");
-                    if (debug_log_fp)
-                        ErrorF("Debug logging enabled to %s\n", log_file_path);
+                    if (debug_log_fp) ErrorF("Debug logging enabled to %s\n",
+                                             log_file_path);
                 }
                 free(log_file_path);
             }
@@ -686,15 +722,15 @@ OsVendorInit(void)
 int
 ddxProcessArgument(int argc, char *argv[], int i)
 {
-//    if ( !strcmp( argv[i], "-fullscreen" ) ) {
-//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
-//        return 1;
-//    }
+    //    if ( !strcmp( argv[i], "-fullscreen" ) ) {
+    //        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
+    //        return 1;
+    //    }
 
-//    if ( !strcmp( argv[i], "-rootless" ) ) {
-//        ErrorF( "Running rootless inside Mac OS X window server.\n" );
-//        return 1;
-//    }
+    //    if ( !strcmp( argv[i], "-rootless" ) ) {
+    //        ErrorF( "Running rootless inside Mac OS X window server.\n" );
+    //        return 1;
+    //    }
 
     // This command line arg is passed when launched from the Aqua GUI.
     if (!strncmp(argv[i], "-psn_", 5)) {
@@ -756,7 +792,8 @@ ddxProcessArgument(int argc, char *argv[], int i)
         darwinDesiredDepth = atoi(argv[i + 1]);
         if (darwinDesiredDepth != -1 &&
             darwinDesiredDepth != 8 &&
-            darwinDesiredDepth != 15 && darwinDesiredDepth != 24) {
+            darwinDesiredDepth != 15 &&
+            darwinDesiredDepth != 24) {
             FatalError("Unsupported pixel depth. Use 8, 15, or 24 bits\n");
         }
 
@@ -785,15 +822,15 @@ ddxUseMsg(void)
     ErrorF("Device Dependent Usage:\n");
     ErrorF("\n");
     ErrorF("-depth <8,15,24> : use this bit depth.\n");
-    ErrorF
-        ("-fakebuttons : fake a three button mouse with Command and Option keys.\n");
+    ErrorF(
+        "-fakebuttons : fake a three button mouse with Command and Option keys.\n");
     ErrorF("-nofakebuttons : don't fake a three button mouse.\n");
-    ErrorF
-        ("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
-    ErrorF
-        ("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
-    ErrorF
-        ("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
+    ErrorF(
+        "-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
+    ErrorF(
+        "-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
+    ErrorF(
+        "  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
     ErrorF("-version : show the server version.\n");
     ErrorF("\n");
 }
@@ -814,7 +851,8 @@ ddxGiveUp(enum ExitCode error)
  *      made to restore all original setting of the displays. Also all devices
  *      are closed.
  */
-_X_NORETURN void
+_X_NORETURN
+void
 AbortDDX(enum ExitCode error)
 {
     ErrorF("   AbortDDX\n");
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index b1157ce97..3cae50b2a 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple, Inc.
+ * Copyright (C) 2008-2012 Apple, Inc.
  * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -37,18 +37,21 @@
 #include "darwinfb.h"
 
 // From darwin.c
-void DarwinPrintBanner(void);
-int DarwinParseModifierList(const char *constmodifiers, int separatelr);
-void DarwinAdjustScreenOrigins(ScreenInfo * pScreenInfo);
+void
+DarwinPrintBanner(void);
+int
+DarwinParseModifierList(const char *constmodifiers, int separatelr);
+void
+DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
 
 #define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \
-    dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))
+                              dixLookupPrivate(&pScreen->devPrivates, \
+                                               darwinScreenKey))
 
 /*
  * Global variables from darwin.c
  */
 extern DevPrivateKeyRec darwinScreenKeyRec;
-
 #define darwinScreenKey (&darwinScreenKeyRec)
 extern int darwinScreensFound;
 extern io_connect_t darwinParamConnect;
@@ -80,10 +83,17 @@ extern char *bundle_id_prefix;
 _X_ATTRIBUTE_PRINTF(6, 7)
 extern void
 xq_asl_log(int level, const char *subsystem, const char *file,
-           const char *function, int line, const char *fmt, ...);
+           const char *function, int line, const char *fmt,
+           ...);
 
-#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
-#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "XQuartz", msg, ##args)
-#define TRACE() DEBUG_LOG("TRACE")
+#define ASL_LOG(level, subsystem, msg, args ...) xq_asl_log(level, subsystem, \
+                                                            __FILE__, \
+                                                            __FUNCTION__, \
+                                                            __LINE__, msg, \
+                                                            ## args)
+#define DEBUG_LOG(msg, args ...)                 ASL_LOG(ASL_LEVEL_DEBUG, \
+                                                         "XQuartz", msg, \
+                                                         ## args)
+#define TRACE()                                  DEBUG_LOG("TRACE")
 
-#endif                          /* _DARWIN_H */
+#endif  /* _DARWIN_H */
diff --git a/xorg-server/hw/xquartz/darwinEvents.c b/xorg-server/hw/xquartz/darwinEvents.c
index cf29a7b21..c62dd4484 100644
--- a/xorg-server/hw/xquartz/darwinEvents.c
+++ b/xorg-server/hw/xquartz/darwinEvents.c
@@ -1,33 +1,41 @@
 /*
-Darwin event queue and event handling
-
-Copyright 2007-2008 Apple Inc.
-Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
-Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
-
-This file is based on mieq.c by Keith Packard,
-which contains the following copyright:
-Copyright 1990, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
+ * Darwin event queue and event handling
+ *
+ * Copyright 2007-2008 Apple Inc.
+ * Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
+ * Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * This file is based on mieq.c by Keith Packard,
+ * which contains the following copyright:
+ * Copyright 1990, 1998  The Open Group
+ *
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
  */
 
 #include "sanitizedCarbon.h"
@@ -75,10 +83,10 @@ in this Software without prior written authorization from The Open Group.
 #include "applewmExt.h"
 
 /* FIXME: Abstract this better */
-extern Bool QuartzModeEventHandler(int screenNum, XQuartzEvent * e,
-                                   DeviceIntPtr dev);
+extern Bool
+QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev);
 
-int darwin_all_modifier_flags = 0;      // last known modifier state
+int darwin_all_modifier_flags = 0;  // last known modifier state
 int darwin_all_modifier_mask = 0;
 int darwin_x11_modifier_mask = 0;
 
@@ -89,14 +97,14 @@ static pthread_mutex_t fd_add_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t fd_add_ready_cond = PTHREAD_COND_INITIALIZER;
 static pthread_t fd_add_tid = NULL;
 
-static InternalEvent *darwinEvents = NULL;
+static InternalEvent* darwinEvents = NULL;
 
 static pthread_mutex_t mieq_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t mieq_ready_cond = PTHREAD_COND_INITIALIZER;
 
 /*** Pthread Magics ***/
 static pthread_t
-create_thread(void *(*func) (void *), void *arg)
+create_thread(void *(*func)(void *), void *arg)
 {
     pthread_attr_t attr;
     pthread_t tid;
@@ -110,12 +118,12 @@ create_thread(void *(*func) (void *), void *arg)
     return tid;
 }
 
-void darwinEvents_lock(void);
+void
+darwinEvents_lock(void);
 void
 darwinEvents_lock(void)
 {
     int err;
-
     if ((err = pthread_mutex_lock(&mieq_lock))) {
         ErrorF("%s:%s:%d: Failed to lock mieq_lock: %d\n",
                __FILE__, __FUNCTION__, __LINE__, err);
@@ -126,12 +134,12 @@ darwinEvents_lock(void)
     }
 }
 
-void darwinEvents_unlock(void);
+void
+darwinEvents_unlock(void);
 void
 darwinEvents_unlock(void)
 {
     int err;
-
     if ((err = pthread_mutex_unlock(&mieq_lock))) {
         ErrorF("%s:%s:%d: Failed to unlock mieq_lock: %d\n",
                __FILE__, __FUNCTION__, __LINE__, err);
@@ -163,12 +171,13 @@ DarwinPressModifierKey(int pressed, int key)
 
 static int darwin_x11_modifier_mask_list[] = {
 #ifdef NX_DEVICELCMDKEYMASK
-    NX_DEVICELCTLKEYMASK, NX_DEVICERCTLKEYMASK,
+    NX_DEVICELCTLKEYMASK,   NX_DEVICERCTLKEYMASK,
     NX_DEVICELSHIFTKEYMASK, NX_DEVICERSHIFTKEYMASK,
-    NX_DEVICELCMDKEYMASK, NX_DEVICERCMDKEYMASK,
-    NX_DEVICELALTKEYMASK, NX_DEVICERALTKEYMASK,
+    NX_DEVICELCMDKEYMASK,   NX_DEVICERCMDKEYMASK,
+    NX_DEVICELALTKEYMASK,   NX_DEVICERALTKEYMASK,
 #else
-    NX_CONTROLMASK, NX_SHIFTMASK, NX_COMMANDMASK, NX_ALTERNATEMASK,
+    NX_CONTROLMASK,         NX_SHIFTMASK,          NX_COMMANDMASK,
+    NX_ALTERNATEMASK,
 #endif
     NX_ALPHASHIFTMASK,
     0
@@ -177,8 +186,8 @@ static int darwin_x11_modifier_mask_list[] = {
 static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, };
 
 static void
-DarwinUpdateModifiers(int pressed,      // KeyPress or KeyRelease
-                      int flags)        // modifier flags that have changed
+DarwinUpdateModifiers(int pressed,                    // KeyPress or KeyRelease
+                      int flags)                      // modifier flags that have changed
 {
     int *f;
     int key;
@@ -195,7 +204,8 @@ DarwinUpdateModifiers(int pressed,      // KeyPress or KeyRelease
         if (*f & flags && *f != NX_ALPHASHIFTMASK) {
             key = DarwinModifierNXMaskToNXKey(*f);
             if (key == -1)
-                ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n", *f);
+                ErrorF("DarwinUpdateModifiers: Unsupported NXMask: 0x%x\n",
+                       *f);
             else
                 DarwinPressModifierKey(pressed, key);
         }
@@ -214,26 +224,32 @@ DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev)
     case kXquartzControllerNotify:
         DEBUG_LOG("kXquartzControllerNotify\n");
         AppleWMSendEvent(AppleWMControllerNotify,
-                         AppleWMControllerNotifyMask, e->data[0], e->data[1]);
+                         AppleWMControllerNotifyMask,
+                         e->data[0],
+                         e->data[1]);
         break;
 
     case kXquartzPasteboardNotify:
         DEBUG_LOG("kXquartzPasteboardNotify\n");
         AppleWMSendEvent(AppleWMPasteboardNotify,
-                         AppleWMPasteboardNotifyMask, e->data[0], e->data[1]);
+                         AppleWMPasteboardNotifyMask,
+                         e->data[0],
+                         e->data[1]);
         break;
 
     case kXquartzActivate:
         DEBUG_LOG("kXquartzActivate\n");
         QuartzShow();
         AppleWMSendEvent(AppleWMActivationNotify,
-                         AppleWMActivationNotifyMask, AppleWMIsActive, 0);
+                         AppleWMActivationNotifyMask,
+                         AppleWMIsActive, 0);
         break;
 
     case kXquartzDeactivate:
         DEBUG_LOG("kXquartzDeactivate\n");
         AppleWMSendEvent(AppleWMActivationNotify,
-                         AppleWMActivationNotifyMask, AppleWMIsInactive, 0);
+                         AppleWMActivationNotifyMask,
+                         AppleWMIsInactive, 0);
         QuartzHide();
         break;
 
@@ -247,8 +263,8 @@ DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev)
     case kXquartzToggleFullscreen:
         DEBUG_LOG("kXquartzToggleFullscreen\n");
         if (XQuartzIsRootless)
-            ErrorF
-                ("Ignoring kXquartzToggleFullscreen because of rootless mode.");
+            ErrorF(
+                "Ignoring kXquartzToggleFullscreen because of rootless mode.");
         else
             QuartzRandRToggleFullscreen();
         break;
@@ -264,7 +280,7 @@ DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev)
         break;
 
     case kXquartzSetRootClip:
-        QuartzSetRootClip((Bool) e->data[0]);
+        QuartzSetRootClip((Bool)e->data[0]);
         break;
 
     case kXquartzQuit:
@@ -277,8 +293,8 @@ DarwinEventHandler(int screenNum, InternalEvent *ie, DeviceIntPtr dev)
         break;
 
     case kXquartzListenOnOpenFD:
-        ErrorF("Calling ListenOnOpenFD() for new fd: %d\n", (int) e->data[0]);
-        ListenOnOpenFD((int) e->data[0], 1);
+        ErrorF("Calling ListenOnOpenFD() for new fd: %d\n", (int)e->data[0]);
+        ListenOnOpenFD((int)e->data[0], 1);
         break;
 
     case kXquartzReloadKeymap:
@@ -333,8 +349,8 @@ DarwinProcessFDAdditionQueue_thread(void *args)
     sleep_for.tv_sec = 3;
     sleep_for.tv_nsec = 0;
 
-    ErrorF
-        ("X11.app: DarwinProcessFDAdditionQueue_thread: Sleeping to allow xinitrc to catchup.\n");
+    ErrorF(
+        "X11.app: DarwinProcessFDAdditionQueue_thread: Sleeping to allow xinitrc to catchup.\n");
     while (nanosleep(&sleep_for, &sleep_remaining) != 0) {
         sleep_for = sleep_remaining;
     }
@@ -361,8 +377,9 @@ DarwinEQInit(void)
         darwin_x11_modifier_mask |= *p;
     }
 
-    for (p = darwin_all_modifier_mask_additions, darwin_all_modifier_mask =
-         darwin_x11_modifier_mask; *p; p++) {
+    for (p = darwin_all_modifier_mask_additions,
+         darwin_all_modifier_mask = darwin_x11_modifier_mask;
+         *p; p++) {
         darwin_all_modifier_mask |= *p;
     }
 
@@ -374,7 +391,8 @@ DarwinEQInit(void)
      * here, so I don't bother.
      */
     if (!darwinEvents) {
-        darwinEvents = InitEventList(GetMaximumEventsNum());;
+        darwinEvents = InitEventList(GetMaximumEventsNum());
+        ;
 
         if (!darwinEvents)
             FatalError("Couldn't allocate event buffer\n");
@@ -420,7 +438,6 @@ static void
 DarwinPokeEQ(void)
 {
     char nullbyte = 0;
-
     //  <daniels> oh, i ... er ... christ.
     write(darwinEventWriteFD, &nullbyte, sizeof(nullbyte));
 }
@@ -430,10 +447,15 @@ DarwinPokeEQ(void)
  *       display.
  */
 static void
-DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,
-                       float pointer_x, float pointer_y,
-                       float pressure, float tilt_x, float tilt_y)
+DarwinPrepareValuators(DeviceIntPtr pDev, ValuatorMask *pmask,
+                       ScreenPtr screen,
+                       double pointer_x, double pointer_y,
+                       double pressure, double tilt_x,
+                       double tilt_y)
 {
+
+    valuator_mask_zero(pmask);
+
     /* Fix offset between darwin and X screens */
     pointer_x -= darwinMainScreenX + screen->x;
     pointer_y -= darwinMainScreenY + screen->y;
@@ -445,38 +467,42 @@ DarwinPrepareValuators(DeviceIntPtr pDev, int *valuators, ScreenPtr screen,
         pointer_y = 0.0;
 
     if (pDev == darwinPointer) {
-        valuators[0] = pointer_x;
-        valuators[1] = pointer_y;
-        valuators[2] = 0;
-        valuators[3] = 0;
-        valuators[4] = 0;
+        valuator_mask_set_double(pmask, 0, pointer_x);
+        valuator_mask_set_double(pmask, 1, pointer_y);
     }
     else {
-        /* Setup our array of values */
-        valuators[0] =
-            XQUARTZ_VALUATOR_LIMIT * (pointer_x /
-                                      (float) screenInfo.screens[0]->width);
-        valuators[1] =
-            XQUARTZ_VALUATOR_LIMIT * (pointer_y /
-                                      (float) screenInfo.screens[0]->height);
-        valuators[2] = XQUARTZ_VALUATOR_LIMIT * pressure;
-        valuators[3] = XQUARTZ_VALUATOR_LIMIT * tilt_x;
-        valuators[4] = XQUARTZ_VALUATOR_LIMIT * tilt_y;
+        valuator_mask_set_double(pmask, 0, XQUARTZ_VALUATOR_LIMIT *
+                                 (pointer_x /
+                                  (double)screenInfo.screens[0]->width));
+        valuator_mask_set_double(pmask, 1, XQUARTZ_VALUATOR_LIMIT *
+                                 (pointer_y /
+                                  (double)screenInfo.screens[0]->height));
+        valuator_mask_set_double(pmask, 2, XQUARTZ_VALUATOR_LIMIT * pressure);
+        valuator_mask_set_double(pmask, 3, XQUARTZ_VALUATOR_LIMIT * tilt_x);
+        valuator_mask_set_double(pmask, 4, XQUARTZ_VALUATOR_LIMIT * tilt_y);
+        DEBUG_LOG("Pointer (%lf, %lf), Valuators: {%lf,%lf,%lf,%lf,%lf}\n",
+                  pointer_x, pointer_y,
+                  valuator_mask_get_double(pmask,
+                                           0),
+                  valuator_mask_get_double(pmask, 1),
+                  valuator_mask_get_double(pmask,
+                                           2),
+                  valuator_mask_get_double(pmask, 3),
+                  valuator_mask_get_double(pmask, 4));
     }
-    //DEBUG_LOG("Pointer (%f, %f), Valuators: {%d,%d,%d,%d,%d}\n", pointer_x, pointer_y,
-    //          valuators[0], valuators[1], valuators[2], valuators[3], valuators[4]);
 }
 
 void
 DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev)
 {
-    darwinEvents_lock(); {
+    darwinEvents_lock();
+    {
         int i;
-
         if (pDev->button) {
             for (i = 0; i < pDev->button->numButtons; i++) {
                 if (BitIsOn(pDev->button->down, i)) {
-                    QueuePointerEvents(pDev, ButtonRelease, i, POINTER_ABSOLUTE,
+                    QueuePointerEvents(pDev, ButtonRelease, i,
+                                       POINTER_ABSOLUTE,
                                        NULL);
                 }
             }
@@ -491,31 +517,31 @@ DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev)
             }
         }
         DarwinPokeEQ();
-    }
-    darwinEvents_unlock();
+    } darwinEvents_unlock();
 }
 
 void
 DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
-                        float pointer_x, float pointer_y, float pressure,
-                        float tilt_x, float tilt_y)
+                        double pointer_x, double pointer_y,
+                        double pressure, double tilt_x,
+                        double tilt_y)
 {
     static int darwinFakeMouseButtonDown = 0;
     ScreenPtr screen;
-    int valuators[5];
+    ValuatorMask valuators;
 
     //DEBUG_LOG("x=%f, y=%f, p=%f, tx=%f, ty=%f\n", pointer_x, pointer_y, pressure, tilt_x, tilt_y);
 
     if (!darwinEvents) {
-        DEBUG_LOG
-            ("DarwinSendPointerEvents called before darwinEvents was initialized\n");
+        DEBUG_LOG(
+            "DarwinSendPointerEvents called before darwinEvents was initialized\n");
         return;
     }
 
     screen = miPointerGetScreen(pDev);
     if (!screen) {
-        DEBUG_LOG
-            ("DarwinSendPointerEvents called before screen was initialized\n");
+        DEBUG_LOG(
+            "DarwinSendPointerEvents called before screen was initialized\n");
         return;
     }
 
@@ -525,20 +551,21 @@ DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
             /* We're currently "down" with another button, so release it first */
             DarwinSendPointerEvents(pDev, ButtonRelease,
                                     darwinFakeMouseButtonDown, pointer_x,
-                                    pointer_y, pressure, tilt_x, tilt_y);
+                                    pointer_y, pressure, tilt_x,
+                                    tilt_y);
             darwinFakeMouseButtonDown = 0;
         }
         if (darwin_all_modifier_flags & darwinFakeMouse2Mask) {
             ev_button = 2;
             darwinFakeMouseButtonDown = 2;
-            DarwinUpdateModKeys(darwin_all_modifier_flags &
-                                ~darwinFakeMouse2Mask);
+            DarwinUpdateModKeys(
+                darwin_all_modifier_flags & ~darwinFakeMouse2Mask);
         }
         else if (darwin_all_modifier_flags & darwinFakeMouse3Mask) {
             ev_button = 3;
             darwinFakeMouseButtonDown = 3;
-            DarwinUpdateModKeys(darwin_all_modifier_flags &
-                                ~darwinFakeMouse3Mask);
+            DarwinUpdateModKeys(
+                darwin_all_modifier_flags & ~darwinFakeMouse3Mask);
         }
     }
 
@@ -548,25 +575,24 @@ DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
         }
 
         if (darwinFakeMouseButtonDown == 2) {
-            DarwinUpdateModKeys(darwin_all_modifier_flags &
-                                ~darwinFakeMouse2Mask);
+            DarwinUpdateModKeys(
+                darwin_all_modifier_flags & ~darwinFakeMouse2Mask);
         }
         else if (darwinFakeMouseButtonDown == 3) {
-            DarwinUpdateModKeys(darwin_all_modifier_flags &
-                                ~darwinFakeMouse3Mask);
+            DarwinUpdateModKeys(
+                darwin_all_modifier_flags & ~darwinFakeMouse3Mask);
         }
 
         darwinFakeMouseButtonDown = 0;
     }
 
-    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y,
-                           pressure, tilt_x, tilt_y);
-    darwinEvents_lock(); {
-        ValuatorMask mask;
-
-        valuator_mask_set_range(&mask, 0, (pDev == darwinPointer) ? 2 : 5,
-                                valuators);
-        QueuePointerEvents(pDev, ev_type, ev_button, POINTER_ABSOLUTE, &mask);
+    DarwinPrepareValuators(pDev, &valuators, screen, pointer_x, pointer_y,
+                           pressure, tilt_x,
+                           tilt_y);
+    darwinEvents_lock();
+    {
+        QueuePointerEvents(pDev, ev_type, ev_button, POINTER_ABSOLUTE,
+                           &valuators);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
@@ -576,93 +602,84 @@ DarwinSendKeyboardEvents(int ev_type, int keycode)
 {
 
     if (!darwinEvents) {
-        DEBUG_LOG
-            ("DarwinSendKeyboardEvents called before darwinEvents was initialized\n");
+        DEBUG_LOG(
+            "DarwinSendKeyboardEvents called before darwinEvents was initialized\n");
         return;
     }
 
-    darwinEvents_lock(); {
+    darwinEvents_lock();
+    {
         QueueKeyboardEvents(darwinKeyboard, ev_type, keycode + MIN_KEYCODE,
                             NULL);
         DarwinPokeEQ();
-    }
-    darwinEvents_unlock();
+    } darwinEvents_unlock();
 }
 
 void
-DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x,
-                          float pointer_y, float pressure, float tilt_x,
-                          float tilt_y)
+DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, double pointer_x,
+                          double pointer_y,
+                          double pressure, double tilt_x,
+                          double tilt_y)
 {
     ScreenPtr screen;
-    int valuators[5];
+    ValuatorMask valuators;
 
     DEBUG_LOG("DarwinSendProximityEvents: %d l:%f,%f p:%f t:%f,%f\n", ev_type,
-              pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+              pointer_x, pointer_y, pressure, tilt_x,
+              tilt_y);
 
     if (!darwinEvents) {
-        DEBUG_LOG
-            ("DarwinSendProximityEvents called before darwinEvents was initialized\n");
+        DEBUG_LOG(
+            "DarwinSendProximityEvents called before darwinEvents was initialized\n");
         return;
     }
 
     screen = miPointerGetScreen(pDev);
     if (!screen) {
-        DEBUG_LOG
-            ("DarwinSendPointerEvents called before screen was initialized\n");
+        DEBUG_LOG(
+            "DarwinSendPointerEvents called before screen was initialized\n");
         return;
     }
 
-    DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y,
-                           pressure, tilt_x, tilt_y);
-    darwinEvents_lock(); {
-        ValuatorMask mask;
-
-        valuator_mask_set_range(&mask, 0, 5, valuators);
-        QueueProximityEvents(pDev, ev_type, &mask);
+    DarwinPrepareValuators(pDev, &valuators, screen, pointer_x, pointer_y,
+                           pressure, tilt_x,
+                           tilt_y);
+    darwinEvents_lock();
+    {
+        QueueProximityEvents(pDev, ev_type, &valuators);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
 
 /* Send the appropriate number of button clicks to emulate scroll wheel */
 void
-DarwinSendScrollEvents(float count_x, float count_y,
-                       float pointer_x, float pointer_y,
-                       float pressure, float tilt_x, float tilt_y)
-{
-    int sign_x, sign_y;
+DarwinSendScrollEvents(double scroll_x, double scroll_y) {
+    ScreenPtr screen;
+    ValuatorMask valuators;
 
     if (!darwinEvents) {
-        DEBUG_LOG
-            ("DarwinSendScrollEvents called before darwinEvents was initialized\n");
+        DEBUG_LOG(
+            "DarwinSendScrollEvents called before darwinEvents was initialized\n");
         return;
     }
 
-    sign_x = count_x > 0.0f ? SCROLLWHEELLEFTFAKE : SCROLLWHEELRIGHTFAKE;
-    sign_y = count_y > 0.0f ? SCROLLWHEELUPFAKE : SCROLLWHEELDOWNFAKE;
-    count_x = fabs(count_x);
-    count_y = fabs(count_y);
-
-    while ((count_x > 0.0f) || (count_y > 0.0f)) {
-        if (count_x > 0.0f) {
-            DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_x,
-                                    pointer_x, pointer_y, pressure, tilt_x,
-                                    tilt_y);
-            DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_x,
-                                    pointer_x, pointer_y, pressure, tilt_x,
-                                    tilt_y);
-            count_x = count_x - 1.0f;
-        }
-        if (count_y > 0.0f) {
-            DarwinSendPointerEvents(darwinPointer, ButtonPress, sign_y,
-                                    pointer_x, pointer_y, pressure, tilt_x,
-                                    tilt_y);
-            DarwinSendPointerEvents(darwinPointer, ButtonRelease, sign_y,
-                                    pointer_x, pointer_y, pressure, tilt_x,
-                                    tilt_y);
-            count_y = count_y - 1.0f;
-        }
+    screen = miPointerGetScreen(darwinPointer);
+    if (!screen) {
+        DEBUG_LOG(
+            "DarwinSendScrollEvents called before screen was initialized\n");
+        return;
     }
+
+    valuator_mask_zero(&valuators);
+    valuator_mask_set_double(&valuators, 2, scroll_y);
+    valuator_mask_set_double(&valuators, 3, scroll_x);
+
+    darwinEvents_lock();
+    {
+        QueuePointerEvents(darwinPointer, MotionNotify, 0,
+                           POINTER_RELATIVE, &valuators);
+        DarwinPokeEQ();
+    } darwinEvents_unlock();    
 }
 
 /* Send the appropriate KeyPress/KeyRelease events to GetKeyboardEvents to
@@ -670,12 +687,12 @@ DarwinSendScrollEvents(float count_x, float count_y,
 void
 DarwinUpdateModKeys(int flags)
 {
-    DarwinUpdateModifiers(KeyRelease,
-                          darwin_all_modifier_flags & ~flags &
-                          darwin_x11_modifier_mask);
-    DarwinUpdateModifiers(KeyPress,
-                          ~darwin_all_modifier_flags & flags &
-                          darwin_x11_modifier_mask);
+    DarwinUpdateModifiers(
+        KeyRelease, darwin_all_modifier_flags & ~flags &
+        darwin_x11_modifier_mask);
+    DarwinUpdateModifiers(
+        KeyPress, ~darwin_all_modifier_flags & flags &
+        darwin_x11_modifier_mask);
     darwin_all_modifier_flags = flags;
 }
 
@@ -700,12 +717,13 @@ DarwinSendDDXEvent(int type, int argc, ...)
     if (argc > 0 && argc < XQUARTZ_EVENT_MAXARGS) {
         va_start(args, argc);
         for (i = 0; i < argc; i++)
-            e.data[i] = (uint32_t) va_arg(args, uint32_t);
+            e.data[i] = (uint32_t)va_arg(args, uint32_t);
         va_end(args);
     }
 
-    darwinEvents_lock(); {
-        mieqEnqueue(NULL, (InternalEvent *) &e);
+    darwinEvents_lock();
+    {
+        mieqEnqueue(NULL, (InternalEvent *)&e);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
diff --git a/xorg-server/hw/xquartz/darwinEvents.h b/xorg-server/hw/xquartz/darwinEvents.h
index 515dd3049..61ace6ee3 100644
--- a/xorg-server/hw/xquartz/darwinEvents.h
+++ b/xorg-server/hw/xquartz/darwinEvents.h
@@ -31,55 +31,67 @@
 /* For extra precision of our cursor and other valuators */
 #define XQUARTZ_VALUATOR_LIMIT (1 << 16)
 
-Bool DarwinEQInit(void);
-void DarwinEQFini(void);
-void DarwinEQEnqueue(const xEventPtr e);
-void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
-void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
-void DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev);
-void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
-                             float pointer_x, float pointer_y, float pressure,
-                             float tilt_x, float tilt_y);
-void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x,
-                               float pointer_y, float pressure, float tilt_x,
-                               float tilt_y);
-void DarwinSendKeyboardEvents(int ev_type, int keycode);
-void DarwinSendScrollEvents(float count_x, float count_y, float pointer_x,
-                            float pointer_y, float pressure, float tilt_x,
-                            float tilt_y);
-void DarwinUpdateModKeys(int flags);
-void DarwinListenOnOpenFD(int fd);
+Bool
+DarwinEQInit(void);
+void
+DarwinEQFini(void);
+void
+DarwinEQEnqueue(const xEventPtr e);
+void
+DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
+void
+DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
+void
+DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev);
+void
+DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
+                        double pointer_x, double pointer_y, double pressure,
+                        double tilt_x,
+                        double tilt_y);
+void
+DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, double pointer_x,
+                          double pointer_y, double pressure, double tilt_x,
+                          double tilt_y);
+void
+DarwinSendKeyboardEvents(int ev_type, int keycode);
+void
+DarwinSendScrollEvents(double scroll_x, double scroll_y);
+void
+DarwinUpdateModKeys(int flags);
+void
+DarwinListenOnOpenFD(int fd);
 
 /*
  * Subtypes for the ET_XQuartz event type
  */
 enum {
-    kXquartzReloadKeymap,       // Reload system keymap
-    kXquartzActivate,           // restore X drawing and cursor
-    kXquartzDeactivate,         // clip X drawing and switch to Aqua cursor
-    kXquartzSetRootClip,        // enable or disable drawing to the X screen
-    kXquartzQuit,               // kill the X server and release the display
-    kXquartzBringAllToFront,    // bring all X windows to front
-    kXquartzToggleFullscreen,   // Enable/Disable fullscreen mode
-    kXquartzSetRootless,        // Set rootless mode
-    kXquartzSpaceChanged,       // Spaces changed
-    kXquartzListenOnOpenFD,     // Listen to the launchd fd (passed as arg)
+    kXquartzReloadKeymap,     // Reload system keymap
+    kXquartzActivate,         // restore X drawing and cursor
+    kXquartzDeactivate,       // clip X drawing and switch to Aqua cursor
+    kXquartzSetRootClip,      // enable or disable drawing to the X screen
+    kXquartzQuit,             // kill the X server and release the display
+    kXquartzBringAllToFront,  // bring all X windows to front
+    kXquartzToggleFullscreen, // Enable/Disable fullscreen mode
+    kXquartzSetRootless,      // Set rootless mode
+    kXquartzSpaceChanged,     // Spaces changed
+    kXquartzListenOnOpenFD,   // Listen to the launchd fd (passed as arg)
     /*
      * AppleWM events
      */
-    kXquartzControllerNotify,   // send an AppleWMControllerNotify event
-    kXquartzPasteboardNotify,   // notify the WM to copy or paste
-    kXquartzReloadPreferences,  // send AppleWMReloadPreferences
+    kXquartzControllerNotify, // send an AppleWMControllerNotify event
+    kXquartzPasteboardNotify, // notify the WM to copy or paste
+    kXquartzReloadPreferences, // send AppleWMReloadPreferences
     /*
      * Xplugin notification events
      */
-    kXquartzDisplayChanged,     // display configuration has changed
-    kXquartzWindowState,        // window visibility state has changed
-    kXquartzWindowMoved,        // window has moved on screen
+    kXquartzDisplayChanged,   // display configuration has changed
+    kXquartzWindowState,      // window visibility state has changed
+    kXquartzWindowMoved,      // window has moved on screen
 };
 
 /* Send one of the above events to the server thread. */
-void DarwinSendDDXEvent(int type, int argc, ...);
+void
+DarwinSendDDXEvent(int type, int argc, ...);
 
 /* A mask of the modifiers that are in our X11 keyboard layout:
  * (Fn for example is just useful for 3button mouse emulation) */
@@ -92,4 +104,4 @@ extern int darwin_x11_modifier_mask;
 /* The current state of the above listed modifiers */
 extern int darwin_all_modifier_flags;
 
-#endif                          /* _DARWIN_EVENTS_H */
+#endif  /* _DARWIN_EVENTS_H */
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 4d6604ed4..3efaa2ca4 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -7,49 +7,49 @@
 
 /************************************************************
 
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-
-			All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
+   Copyright 1989, 1998  The Open Group
+
+   Permission to use, copy, modify, distribute, and sell this software and its
+   documentation for any purpose is hereby granted without fee, provided that
+   the above copyright notice appear in all copies and that both that
+   copyright notice and this permission notice appear in supporting
+   documentation.
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+   AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   Except as contained in this notice, the name of The Open Group shall not be
+   used in advertising or otherwise to promote the sale, use or other dealings
+   in this Software without prior written authorization from The Open Group.
+
+   Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+   All Rights Reserved
+
+   Permission to use, copy, modify, and distribute this software and its
+   documentation for any purpose and without fee is hereby granted,
+   provided that the above copyright notice appear in all copies and that
+   both that copyright notice and this permission notice appear in
+   supporting documentation, and that the name of Hewlett-Packard not be
+   used in advertising or publicity pertaining to distribution of the
+   software without specific, written prior permission.
+
+   HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+   HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+   ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+   WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+   ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+   SOFTWARE.
+
+ ********************************************************/
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
@@ -112,7 +112,8 @@ SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
  */
 
 int
-ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, xDeviceCtl * control)
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
+                    xDeviceCtl * control)
 {
 
     DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);
@@ -127,7 +128,7 @@ ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, xDeviceCtl * control)
  *
  */
 int
-NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
                       DeviceIntPtr *pdev)
 {
     DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);
diff --git a/xorg-server/hw/xquartz/darwinfb.h b/xorg-server/hw/xquartz/darwinfb.h
index dab6d4b86..5de360d75 100644
--- a/xorg-server/hw/xquartz/darwinfb.h
+++ b/xorg-server/hw/xquartz/darwinfb.h
@@ -32,25 +32,26 @@
 
 typedef struct {
     void                *framebuffer;
-    int                 x;
-    int                 y;
-    int                 width;
-    int                 height;
-    int                 pitch;
-    int                 depth;
-    int                 visuals;
-    int                 bitsPerRGB;
-    int                 bitsPerPixel;
-    int                 preferredCVC;
-    Pixel               redMask;
-    Pixel               greenMask;
-    Pixel               blueMask;
+    int x;
+    int y;
+    int width;
+    int height;
+    int pitch;
+    int depth;
+    int visuals;
+    int bitsPerRGB;
+    int bitsPerPixel;
+    int preferredCVC;
+    Pixel redMask;
+    Pixel greenMask;
+    Pixel blueMask;
 } DarwinFramebufferRec, *DarwinFramebufferPtr;
 
-#define MASK_LH(l,h) (((1 << (1 + (h) - (l))) - 1) << (l))
-#define BM_ARGB(a,r,g,b) MASK_LH(0, (b) - 1)
-#define GM_ARGB(a,r,g,b) MASK_LH(b, (b) + (g) - 1)
-#define RM_ARGB(a,r,g,b) MASK_LH((b) + (g), (b) + (g) + (r) - 1)
-#define AM_ARGB(a,r,g,b) MASK_LH((b) + (g) + (r), (b) + (g) + (r) + (a) - 1)
+#define MASK_LH(l, h)       (((1 << (1 + (h) - (l))) - 1) << (l))
+#define BM_ARGB(a, r, g, b) MASK_LH(0, (b) - 1)
+#define GM_ARGB(a, r, g, b) MASK_LH(b, (b) + (g) - 1)
+#define RM_ARGB(a, r, g, b) MASK_LH((b) + (g), (b) + (g) + (r) - 1)
+#define AM_ARGB(a, r, g, b) MASK_LH((b) + (g) + (r), \
+                                    (b) + (g) + (r) + (a) - 1)
 
 #endif  /* _DARWIN_FB_H */
diff --git a/xorg-server/hw/xquartz/keysym2ucs.c b/xorg-server/hw/xquartz/keysym2ucs.c
index 73ea55ad3..934b57756 100644
--- a/xorg-server/hw/xquartz/keysym2ucs.c
+++ b/xorg-server/hw/xquartz/keysym2ucs.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
@@ -45,787 +45,787 @@ struct codepair {
 };
 
 const static struct codepair keysymtab[] = {
-    {0x01a1, 0x0104},
-    {0x01a2, 0x02d8},
-    {0x01a3, 0x0141},
-    {0x01a5, 0x013d},
-    {0x01a6, 0x015a},
-    {0x01a9, 0x0160},
-    {0x01aa, 0x015e},
-    {0x01ab, 0x0164},
-    {0x01ac, 0x0179},
-    {0x01ae, 0x017d},
-    {0x01af, 0x017b},
-    {0x01b1, 0x0105},
-    {0x01b2, 0x02db},
-    {0x01b3, 0x0142},
-    {0x01b5, 0x013e},
-    {0x01b6, 0x015b},
-    {0x01b7, 0x02c7},
-    {0x01b9, 0x0161},
-    {0x01ba, 0x015f},
-    {0x01bb, 0x0165},
-    {0x01bc, 0x017a},
-    {0x01bd, 0x02dd},
-    {0x01be, 0x017e},
-    {0x01bf, 0x017c},
-    {0x01c0, 0x0154},
-    {0x01c3, 0x0102},
-    {0x01c5, 0x0139},
-    {0x01c6, 0x0106},
-    {0x01c8, 0x010c},
-    {0x01ca, 0x0118},
-    {0x01cc, 0x011a},
-    {0x01cf, 0x010e},
-    {0x01d0, 0x0110},
-    {0x01d1, 0x0143},
-    {0x01d2, 0x0147},
-    {0x01d5, 0x0150},
-    {0x01d8, 0x0158},
-    {0x01d9, 0x016e},
-    {0x01db, 0x0170},
-    {0x01de, 0x0162},
-    {0x01e0, 0x0155},
-    {0x01e3, 0x0103},
-    {0x01e5, 0x013a},
-    {0x01e6, 0x0107},
-    {0x01e8, 0x010d},
-    {0x01ea, 0x0119},
-    {0x01ec, 0x011b},
-    {0x01ef, 0x010f},
-    {0x01f0, 0x0111},
-    {0x01f1, 0x0144},
-    {0x01f2, 0x0148},
-    {0x01f5, 0x0151},
-    {0x01f8, 0x0159},
-    {0x01f9, 0x016f},
-    {0x01fb, 0x0171},
-    {0x01fe, 0x0163},
-    {0x01ff, 0x02d9},
-    {0x02a1, 0x0126},
-    {0x02a6, 0x0124},
-    {0x02a9, 0x0130},
-    {0x02ab, 0x011e},
-    {0x02ac, 0x0134},
-    {0x02b1, 0x0127},
-    {0x02b6, 0x0125},
-    {0x02b9, 0x0131},
-    {0x02bb, 0x011f},
-    {0x02bc, 0x0135},
-    {0x02c5, 0x010a},
-    {0x02c6, 0x0108},
-    {0x02d5, 0x0120},
-    {0x02d8, 0x011c},
-    {0x02dd, 0x016c},
-    {0x02de, 0x015c},
-    {0x02e5, 0x010b},
-    {0x02e6, 0x0109},
-    {0x02f5, 0x0121},
-    {0x02f8, 0x011d},
-    {0x02fd, 0x016d},
-    {0x02fe, 0x015d},
-    {0x03a2, 0x0138},
-    {0x03a3, 0x0156},
-    {0x03a5, 0x0128},
-    {0x03a6, 0x013b},
-    {0x03aa, 0x0112},
-    {0x03ab, 0x0122},
-    {0x03ac, 0x0166},
-    {0x03b3, 0x0157},
-    {0x03b5, 0x0129},
-    {0x03b6, 0x013c},
-    {0x03ba, 0x0113},
-    {0x03bb, 0x0123},
-    {0x03bc, 0x0167},
-    {0x03bd, 0x014a},
-    {0x03bf, 0x014b},
-    {0x03c0, 0x0100},
-    {0x03c7, 0x012e},
-    {0x03cc, 0x0116},
-    {0x03cf, 0x012a},
-    {0x03d1, 0x0145},
-    {0x03d2, 0x014c},
-    {0x03d3, 0x0136},
-    {0x03d9, 0x0172},
-    {0x03dd, 0x0168},
-    {0x03de, 0x016a},
-    {0x03e0, 0x0101},
-    {0x03e7, 0x012f},
-    {0x03ec, 0x0117},
-    {0x03ef, 0x012b},
-    {0x03f1, 0x0146},
-    {0x03f2, 0x014d},
-    {0x03f3, 0x0137},
-    {0x03f9, 0x0173},
-    {0x03fd, 0x0169},
-    {0x03fe, 0x016b},
-    {0x047e, 0x203e},
-    {0x04a1, 0x3002},
-    {0x04a2, 0x300c},
-    {0x04a3, 0x300d},
-    {0x04a4, 0x3001},
-    {0x04a5, 0x30fb},
-    {0x04a6, 0x30f2},
-    {0x04a7, 0x30a1},
-    {0x04a8, 0x30a3},
-    {0x04a9, 0x30a5},
-    {0x04aa, 0x30a7},
-    {0x04ab, 0x30a9},
-    {0x04ac, 0x30e3},
-    {0x04ad, 0x30e5},
-    {0x04ae, 0x30e7},
-    {0x04af, 0x30c3},
-    {0x04b0, 0x30fc},
-    {0x04b1, 0x30a2},
-    {0x04b2, 0x30a4},
-    {0x04b3, 0x30a6},
-    {0x04b4, 0x30a8},
-    {0x04b5, 0x30aa},
-    {0x04b6, 0x30ab},
-    {0x04b7, 0x30ad},
-    {0x04b8, 0x30af},
-    {0x04b9, 0x30b1},
-    {0x04ba, 0x30b3},
-    {0x04bb, 0x30b5},
-    {0x04bc, 0x30b7},
-    {0x04bd, 0x30b9},
-    {0x04be, 0x30bb},
-    {0x04bf, 0x30bd},
-    {0x04c0, 0x30bf},
-    {0x04c1, 0x30c1},
-    {0x04c2, 0x30c4},
-    {0x04c3, 0x30c6},
-    {0x04c4, 0x30c8},
-    {0x04c5, 0x30ca},
-    {0x04c6, 0x30cb},
-    {0x04c7, 0x30cc},
-    {0x04c8, 0x30cd},
-    {0x04c9, 0x30ce},
-    {0x04ca, 0x30cf},
-    {0x04cb, 0x30d2},
-    {0x04cc, 0x30d5},
-    {0x04cd, 0x30d8},
-    {0x04ce, 0x30db},
-    {0x04cf, 0x30de},
-    {0x04d0, 0x30df},
-    {0x04d1, 0x30e0},
-    {0x04d2, 0x30e1},
-    {0x04d3, 0x30e2},
-    {0x04d4, 0x30e4},
-    {0x04d5, 0x30e6},
-    {0x04d6, 0x30e8},
-    {0x04d7, 0x30e9},
-    {0x04d8, 0x30ea},
-    {0x04d9, 0x30eb},
-    {0x04da, 0x30ec},
-    {0x04db, 0x30ed},
-    {0x04dc, 0x30ef},
-    {0x04dd, 0x30f3},
-    {0x04de, 0x309b},
-    {0x04df, 0x309c},
-    {0x05ac, 0x060c},
-    {0x05bb, 0x061b},
-    {0x05bf, 0x061f},
-    {0x05c1, 0x0621},
-    {0x05c2, 0x0622},
-    {0x05c3, 0x0623},
-    {0x05c4, 0x0624},
-    {0x05c5, 0x0625},
-    {0x05c6, 0x0626},
-    {0x05c7, 0x0627},
-    {0x05c8, 0x0628},
-    {0x05c9, 0x0629},
-    {0x05ca, 0x062a},
-    {0x05cb, 0x062b},
-    {0x05cc, 0x062c},
-    {0x05cd, 0x062d},
-    {0x05ce, 0x062e},
-    {0x05cf, 0x062f},
-    {0x05d0, 0x0630},
-    {0x05d1, 0x0631},
-    {0x05d2, 0x0632},
-    {0x05d3, 0x0633},
-    {0x05d4, 0x0634},
-    {0x05d5, 0x0635},
-    {0x05d6, 0x0636},
-    {0x05d7, 0x0637},
-    {0x05d8, 0x0638},
-    {0x05d9, 0x0639},
-    {0x05da, 0x063a},
-    {0x05e0, 0x0640},
-    {0x05e1, 0x0641},
-    {0x05e2, 0x0642},
-    {0x05e3, 0x0643},
-    {0x05e4, 0x0644},
-    {0x05e5, 0x0645},
-    {0x05e6, 0x0646},
-    {0x05e7, 0x0647},
-    {0x05e8, 0x0648},
-    {0x05e9, 0x0649},
-    {0x05ea, 0x064a},
-    {0x05eb, 0x064b},
-    {0x05ec, 0x064c},
-    {0x05ed, 0x064d},
-    {0x05ee, 0x064e},
-    {0x05ef, 0x064f},
-    {0x05f0, 0x0650},
-    {0x05f1, 0x0651},
-    {0x05f2, 0x0652},
-    {0x06a1, 0x0452},
-    {0x06a2, 0x0453},
-    {0x06a3, 0x0451},
-    {0x06a4, 0x0454},
-    {0x06a5, 0x0455},
-    {0x06a6, 0x0456},
-    {0x06a7, 0x0457},
-    {0x06a8, 0x0458},
-    {0x06a9, 0x0459},
-    {0x06aa, 0x045a},
-    {0x06ab, 0x045b},
-    {0x06ac, 0x045c},
-    {0x06ae, 0x045e},
-    {0x06af, 0x045f},
-    {0x06b0, 0x2116},
-    {0x06b1, 0x0402},
-    {0x06b2, 0x0403},
-    {0x06b3, 0x0401},
-    {0x06b4, 0x0404},
-    {0x06b5, 0x0405},
-    {0x06b6, 0x0406},
-    {0x06b7, 0x0407},
-    {0x06b8, 0x0408},
-    {0x06b9, 0x0409},
-    {0x06ba, 0x040a},
-    {0x06bb, 0x040b},
-    {0x06bc, 0x040c},
-    {0x06be, 0x040e},
-    {0x06bf, 0x040f},
-    {0x06c0, 0x044e},
-    {0x06c1, 0x0430},
-    {0x06c2, 0x0431},
-    {0x06c3, 0x0446},
-    {0x06c4, 0x0434},
-    {0x06c5, 0x0435},
-    {0x06c6, 0x0444},
-    {0x06c7, 0x0433},
-    {0x06c8, 0x0445},
-    {0x06c9, 0x0438},
-    {0x06ca, 0x0439},
-    {0x06cb, 0x043a},
-    {0x06cc, 0x043b},
-    {0x06cd, 0x043c},
-    {0x06ce, 0x043d},
-    {0x06cf, 0x043e},
-    {0x06d0, 0x043f},
-    {0x06d1, 0x044f},
-    {0x06d2, 0x0440},
-    {0x06d3, 0x0441},
-    {0x06d4, 0x0442},
-    {0x06d5, 0x0443},
-    {0x06d6, 0x0436},
-    {0x06d7, 0x0432},
-    {0x06d8, 0x044c},
-    {0x06d9, 0x044b},
-    {0x06da, 0x0437},
-    {0x06db, 0x0448},
-    {0x06dc, 0x044d},
-    {0x06dd, 0x0449},
-    {0x06de, 0x0447},
-    {0x06df, 0x044a},
-    {0x06e0, 0x042e},
-    {0x06e1, 0x0410},
-    {0x06e2, 0x0411},
-    {0x06e3, 0x0426},
-    {0x06e4, 0x0414},
-    {0x06e5, 0x0415},
-    {0x06e6, 0x0424},
-    {0x06e7, 0x0413},
-    {0x06e8, 0x0425},
-    {0x06e9, 0x0418},
-    {0x06ea, 0x0419},
-    {0x06eb, 0x041a},
-    {0x06ec, 0x041b},
-    {0x06ed, 0x041c},
-    {0x06ee, 0x041d},
-    {0x06ef, 0x041e},
-    {0x06f0, 0x041f},
-    {0x06f1, 0x042f},
-    {0x06f2, 0x0420},
-    {0x06f3, 0x0421},
-    {0x06f4, 0x0422},
-    {0x06f5, 0x0423},
-    {0x06f6, 0x0416},
-    {0x06f7, 0x0412},
-    {0x06f8, 0x042c},
-    {0x06f9, 0x042b},
-    {0x06fa, 0x0417},
-    {0x06fb, 0x0428},
-    {0x06fc, 0x042d},
-    {0x06fd, 0x0429},
-    {0x06fe, 0x0427},
-    {0x06ff, 0x042a},
-    {0x07a1, 0x0386},
-    {0x07a2, 0x0388},
-    {0x07a3, 0x0389},
-    {0x07a4, 0x038a},
-    {0x07a5, 0x03aa},
-    {0x07a7, 0x038c},
-    {0x07a8, 0x038e},
-    {0x07a9, 0x03ab},
-    {0x07ab, 0x038f},
-    {0x07ae, 0x0385},
-    {0x07af, 0x2015},
-    {0x07b1, 0x03ac},
-    {0x07b2, 0x03ad},
-    {0x07b3, 0x03ae},
-    {0x07b4, 0x03af},
-    {0x07b5, 0x03ca},
-    {0x07b6, 0x0390},
-    {0x07b7, 0x03cc},
-    {0x07b8, 0x03cd},
-    {0x07b9, 0x03cb},
-    {0x07ba, 0x03b0},
-    {0x07bb, 0x03ce},
-    {0x07c1, 0x0391},
-    {0x07c2, 0x0392},
-    {0x07c3, 0x0393},
-    {0x07c4, 0x0394},
-    {0x07c5, 0x0395},
-    {0x07c6, 0x0396},
-    {0x07c7, 0x0397},
-    {0x07c8, 0x0398},
-    {0x07c9, 0x0399},
-    {0x07ca, 0x039a},
-    {0x07cb, 0x039b},
-    {0x07cc, 0x039c},
-    {0x07cd, 0x039d},
-    {0x07ce, 0x039e},
-    {0x07cf, 0x039f},
-    {0x07d0, 0x03a0},
-    {0x07d1, 0x03a1},
-    {0x07d2, 0x03a3},
-    {0x07d4, 0x03a4},
-    {0x07d5, 0x03a5},
-    {0x07d6, 0x03a6},
-    {0x07d7, 0x03a7},
-    {0x07d8, 0x03a8},
-    {0x07d9, 0x03a9},
-    {0x07e1, 0x03b1},
-    {0x07e2, 0x03b2},
-    {0x07e3, 0x03b3},
-    {0x07e4, 0x03b4},
-    {0x07e5, 0x03b5},
-    {0x07e6, 0x03b6},
-    {0x07e7, 0x03b7},
-    {0x07e8, 0x03b8},
-    {0x07e9, 0x03b9},
-    {0x07ea, 0x03ba},
-    {0x07eb, 0x03bb},
-    {0x07ec, 0x03bc},
-    {0x07ed, 0x03bd},
-    {0x07ee, 0x03be},
-    {0x07ef, 0x03bf},
-    {0x07f0, 0x03c0},
-    {0x07f1, 0x03c1},
-    {0x07f2, 0x03c3},
-    {0x07f3, 0x03c2},
-    {0x07f4, 0x03c4},
-    {0x07f5, 0x03c5},
-    {0x07f6, 0x03c6},
-    {0x07f7, 0x03c7},
-    {0x07f8, 0x03c8},
-    {0x07f9, 0x03c9},
-    {0x08a1, 0x23b7},
-    {0x08a2, 0x250c},
-    {0x08a3, 0x2500},
-    {0x08a4, 0x2320},
-    {0x08a5, 0x2321},
-    {0x08a6, 0x2502},
-    {0x08a7, 0x23a1},
-    {0x08a8, 0x23a3},
-    {0x08a9, 0x23a4},
-    {0x08aa, 0x23a6},
-    {0x08ab, 0x239b},
-    {0x08ac, 0x239d},
-    {0x08ad, 0x239e},
-    {0x08ae, 0x23a0},
-    {0x08af, 0x23a8},
-    {0x08b0, 0x23ac},
-    {0x08bc, 0x2264},
-    {0x08bd, 0x2260},
-    {0x08be, 0x2265},
-    {0x08bf, 0x222b},
-    {0x08c0, 0x2234},
-    {0x08c1, 0x221d},
-    {0x08c2, 0x221e},
-    {0x08c5, 0x2207},
-    {0x08c8, 0x223c},
-    {0x08c9, 0x2243},
-    {0x08cd, 0x21d4},
-    {0x08ce, 0x21d2},
-    {0x08cf, 0x2261},
-    {0x08d6, 0x221a},
-    {0x08da, 0x2282},
-    {0x08db, 0x2283},
-    {0x08dc, 0x2229},
-    {0x08dd, 0x222a},
-    {0x08de, 0x2227},
-    {0x08df, 0x2228},
-    {0x08ef, 0x2202},
-    {0x08f6, 0x0192},
-    {0x08fb, 0x2190},
-    {0x08fc, 0x2191},
-    {0x08fd, 0x2192},
-    {0x08fe, 0x2193},
-    {0x09e0, 0x25c6},
-    {0x09e1, 0x2592},
-    {0x09e2, 0x2409},
-    {0x09e3, 0x240c},
-    {0x09e4, 0x240d},
-    {0x09e5, 0x240a},
-    {0x09e8, 0x2424},
-    {0x09e9, 0x240b},
-    {0x09ea, 0x2518},
-    {0x09eb, 0x2510},
-    {0x09ec, 0x250c},
-    {0x09ed, 0x2514},
-    {0x09ee, 0x253c},
-    {0x09ef, 0x23ba},
-    {0x09f0, 0x23bb},
-    {0x09f1, 0x2500},
-    {0x09f2, 0x23bc},
-    {0x09f3, 0x23bd},
-    {0x09f4, 0x251c},
-    {0x09f5, 0x2524},
-    {0x09f6, 0x2534},
-    {0x09f7, 0x252c},
-    {0x09f8, 0x2502},
-    {0x0aa1, 0x2003},
-    {0x0aa2, 0x2002},
-    {0x0aa3, 0x2004},
-    {0x0aa4, 0x2005},
-    {0x0aa5, 0x2007},
-    {0x0aa6, 0x2008},
-    {0x0aa7, 0x2009},
-    {0x0aa8, 0x200a},
-    {0x0aa9, 0x2014},
-    {0x0aaa, 0x2013},
-    {0x0aae, 0x2026},
-    {0x0aaf, 0x2025},
-    {0x0ab0, 0x2153},
-    {0x0ab1, 0x2154},
-    {0x0ab2, 0x2155},
-    {0x0ab3, 0x2156},
-    {0x0ab4, 0x2157},
-    {0x0ab5, 0x2158},
-    {0x0ab6, 0x2159},
-    {0x0ab7, 0x215a},
-    {0x0ab8, 0x2105},
-    {0x0abb, 0x2012},
-    {0x0abc, 0x2329},
-    {0x0abe, 0x232a},
-    {0x0ac3, 0x215b},
-    {0x0ac4, 0x215c},
-    {0x0ac5, 0x215d},
-    {0x0ac6, 0x215e},
-    {0x0ac9, 0x2122},
-    {0x0aca, 0x2613},
-    {0x0acc, 0x25c1},
-    {0x0acd, 0x25b7},
-    {0x0ace, 0x25cb},
-    {0x0acf, 0x25af},
-    {0x0ad0, 0x2018},
-    {0x0ad1, 0x2019},
-    {0x0ad2, 0x201c},
-    {0x0ad3, 0x201d},
-    {0x0ad4, 0x211e},
-    {0x0ad6, 0x2032},
-    {0x0ad7, 0x2033},
-    {0x0ad9, 0x271d},
-    {0x0adb, 0x25ac},
-    {0x0adc, 0x25c0},
-    {0x0add, 0x25b6},
-    {0x0ade, 0x25cf},
-    {0x0adf, 0x25ae},
-    {0x0ae0, 0x25e6},
-    {0x0ae1, 0x25ab},
-    {0x0ae2, 0x25ad},
-    {0x0ae3, 0x25b3},
-    {0x0ae4, 0x25bd},
-    {0x0ae5, 0x2606},
-    {0x0ae6, 0x2022},
-    {0x0ae7, 0x25aa},
-    {0x0ae8, 0x25b2},
-    {0x0ae9, 0x25bc},
-    {0x0aea, 0x261c},
-    {0x0aeb, 0x261e},
-    {0x0aec, 0x2663},
-    {0x0aed, 0x2666},
-    {0x0aee, 0x2665},
-    {0x0af0, 0x2720},
-    {0x0af1, 0x2020},
-    {0x0af2, 0x2021},
-    {0x0af3, 0x2713},
-    {0x0af4, 0x2717},
-    {0x0af5, 0x266f},
-    {0x0af6, 0x266d},
-    {0x0af7, 0x2642},
-    {0x0af8, 0x2640},
-    {0x0af9, 0x260e},
-    {0x0afa, 0x2315},
-    {0x0afb, 0x2117},
-    {0x0afc, 0x2038},
-    {0x0afd, 0x201a},
-    {0x0afe, 0x201e},
-    {0x0ba3, 0x003c},
-    {0x0ba6, 0x003e},
-    {0x0ba8, 0x2228},
-    {0x0ba9, 0x2227},
-    {0x0bc0, 0x00af},
-    {0x0bc2, 0x22a5},
-    {0x0bc3, 0x2229},
-    {0x0bc4, 0x230a},
-    {0x0bc6, 0x005f},
-    {0x0bca, 0x2218},
-    {0x0bcc, 0x2395},
-    {0x0bce, 0x22a4},
-    {0x0bcf, 0x25cb},
-    {0x0bd3, 0x2308},
-    {0x0bd6, 0x222a},
-    {0x0bd8, 0x2283},
-    {0x0bda, 0x2282},
-    {0x0bdc, 0x22a2},
-    {0x0bfc, 0x22a3},
-    {0x0cdf, 0x2017},
-    {0x0ce0, 0x05d0},
-    {0x0ce1, 0x05d1},
-    {0x0ce2, 0x05d2},
-    {0x0ce3, 0x05d3},
-    {0x0ce4, 0x05d4},
-    {0x0ce5, 0x05d5},
-    {0x0ce6, 0x05d6},
-    {0x0ce7, 0x05d7},
-    {0x0ce8, 0x05d8},
-    {0x0ce9, 0x05d9},
-    {0x0cea, 0x05da},
-    {0x0ceb, 0x05db},
-    {0x0cec, 0x05dc},
-    {0x0ced, 0x05dd},
-    {0x0cee, 0x05de},
-    {0x0cef, 0x05df},
-    {0x0cf0, 0x05e0},
-    {0x0cf1, 0x05e1},
-    {0x0cf2, 0x05e2},
-    {0x0cf3, 0x05e3},
-    {0x0cf4, 0x05e4},
-    {0x0cf5, 0x05e5},
-    {0x0cf6, 0x05e6},
-    {0x0cf7, 0x05e7},
-    {0x0cf8, 0x05e8},
-    {0x0cf9, 0x05e9},
-    {0x0cfa, 0x05ea},
-    {0x0da1, 0x0e01},
-    {0x0da2, 0x0e02},
-    {0x0da3, 0x0e03},
-    {0x0da4, 0x0e04},
-    {0x0da5, 0x0e05},
-    {0x0da6, 0x0e06},
-    {0x0da7, 0x0e07},
-    {0x0da8, 0x0e08},
-    {0x0da9, 0x0e09},
-    {0x0daa, 0x0e0a},
-    {0x0dab, 0x0e0b},
-    {0x0dac, 0x0e0c},
-    {0x0dad, 0x0e0d},
-    {0x0dae, 0x0e0e},
-    {0x0daf, 0x0e0f},
-    {0x0db0, 0x0e10},
-    {0x0db1, 0x0e11},
-    {0x0db2, 0x0e12},
-    {0x0db3, 0x0e13},
-    {0x0db4, 0x0e14},
-    {0x0db5, 0x0e15},
-    {0x0db6, 0x0e16},
-    {0x0db7, 0x0e17},
-    {0x0db8, 0x0e18},
-    {0x0db9, 0x0e19},
-    {0x0dba, 0x0e1a},
-    {0x0dbb, 0x0e1b},
-    {0x0dbc, 0x0e1c},
-    {0x0dbd, 0x0e1d},
-    {0x0dbe, 0x0e1e},
-    {0x0dbf, 0x0e1f},
-    {0x0dc0, 0x0e20},
-    {0x0dc1, 0x0e21},
-    {0x0dc2, 0x0e22},
-    {0x0dc3, 0x0e23},
-    {0x0dc4, 0x0e24},
-    {0x0dc5, 0x0e25},
-    {0x0dc6, 0x0e26},
-    {0x0dc7, 0x0e27},
-    {0x0dc8, 0x0e28},
-    {0x0dc9, 0x0e29},
-    {0x0dca, 0x0e2a},
-    {0x0dcb, 0x0e2b},
-    {0x0dcc, 0x0e2c},
-    {0x0dcd, 0x0e2d},
-    {0x0dce, 0x0e2e},
-    {0x0dcf, 0x0e2f},
-    {0x0dd0, 0x0e30},
-    {0x0dd1, 0x0e31},
-    {0x0dd2, 0x0e32},
-    {0x0dd3, 0x0e33},
-    {0x0dd4, 0x0e34},
-    {0x0dd5, 0x0e35},
-    {0x0dd6, 0x0e36},
-    {0x0dd7, 0x0e37},
-    {0x0dd8, 0x0e38},
-    {0x0dd9, 0x0e39},
-    {0x0dda, 0x0e3a},
-    {0x0ddf, 0x0e3f},
-    {0x0de0, 0x0e40},
-    {0x0de1, 0x0e41},
-    {0x0de2, 0x0e42},
-    {0x0de3, 0x0e43},
-    {0x0de4, 0x0e44},
-    {0x0de5, 0x0e45},
-    {0x0de6, 0x0e46},
-    {0x0de7, 0x0e47},
-    {0x0de8, 0x0e48},
-    {0x0de9, 0x0e49},
-    {0x0dea, 0x0e4a},
-    {0x0deb, 0x0e4b},
-    {0x0dec, 0x0e4c},
-    {0x0ded, 0x0e4d},
-    {0x0df0, 0x0e50},
-    {0x0df1, 0x0e51},
-    {0x0df2, 0x0e52},
-    {0x0df3, 0x0e53},
-    {0x0df4, 0x0e54},
-    {0x0df5, 0x0e55},
-    {0x0df6, 0x0e56},
-    {0x0df7, 0x0e57},
-    {0x0df8, 0x0e58},
-    {0x0df9, 0x0e59},
-    {0x0ea1, 0x3131},
-    {0x0ea2, 0x3132},
-    {0x0ea3, 0x3133},
-    {0x0ea4, 0x3134},
-    {0x0ea5, 0x3135},
-    {0x0ea6, 0x3136},
-    {0x0ea7, 0x3137},
-    {0x0ea8, 0x3138},
-    {0x0ea9, 0x3139},
-    {0x0eaa, 0x313a},
-    {0x0eab, 0x313b},
-    {0x0eac, 0x313c},
-    {0x0ead, 0x313d},
-    {0x0eae, 0x313e},
-    {0x0eaf, 0x313f},
-    {0x0eb0, 0x3140},
-    {0x0eb1, 0x3141},
-    {0x0eb2, 0x3142},
-    {0x0eb3, 0x3143},
-    {0x0eb4, 0x3144},
-    {0x0eb5, 0x3145},
-    {0x0eb6, 0x3146},
-    {0x0eb7, 0x3147},
-    {0x0eb8, 0x3148},
-    {0x0eb9, 0x3149},
-    {0x0eba, 0x314a},
-    {0x0ebb, 0x314b},
-    {0x0ebc, 0x314c},
-    {0x0ebd, 0x314d},
-    {0x0ebe, 0x314e},
-    {0x0ebf, 0x314f},
-    {0x0ec0, 0x3150},
-    {0x0ec1, 0x3151},
-    {0x0ec2, 0x3152},
-    {0x0ec3, 0x3153},
-    {0x0ec4, 0x3154},
-    {0x0ec5, 0x3155},
-    {0x0ec6, 0x3156},
-    {0x0ec7, 0x3157},
-    {0x0ec8, 0x3158},
-    {0x0ec9, 0x3159},
-    {0x0eca, 0x315a},
-    {0x0ecb, 0x315b},
-    {0x0ecc, 0x315c},
-    {0x0ecd, 0x315d},
-    {0x0ece, 0x315e},
-    {0x0ecf, 0x315f},
-    {0x0ed0, 0x3160},
-    {0x0ed1, 0x3161},
-    {0x0ed2, 0x3162},
-    {0x0ed3, 0x3163},
-    {0x0ed4, 0x11a8},
-    {0x0ed5, 0x11a9},
-    {0x0ed6, 0x11aa},
-    {0x0ed7, 0x11ab},
-    {0x0ed8, 0x11ac},
-    {0x0ed9, 0x11ad},
-    {0x0eda, 0x11ae},
-    {0x0edb, 0x11af},
-    {0x0edc, 0x11b0},
-    {0x0edd, 0x11b1},
-    {0x0ede, 0x11b2},
-    {0x0edf, 0x11b3},
-    {0x0ee0, 0x11b4},
-    {0x0ee1, 0x11b5},
-    {0x0ee2, 0x11b6},
-    {0x0ee3, 0x11b7},
-    {0x0ee4, 0x11b8},
-    {0x0ee5, 0x11b9},
-    {0x0ee6, 0x11ba},
-    {0x0ee7, 0x11bb},
-    {0x0ee8, 0x11bc},
-    {0x0ee9, 0x11bd},
-    {0x0eea, 0x11be},
-    {0x0eeb, 0x11bf},
-    {0x0eec, 0x11c0},
-    {0x0eed, 0x11c1},
-    {0x0eee, 0x11c2},
-    {0x0eef, 0x316d},
-    {0x0ef0, 0x3171},
-    {0x0ef1, 0x3178},
-    {0x0ef2, 0x317f},
-    {0x0ef3, 0x3181},
-    {0x0ef4, 0x3184},
-    {0x0ef5, 0x3186},
-    {0x0ef6, 0x318d},
-    {0x0ef7, 0x318e},
-    {0x0ef8, 0x11eb},
-    {0x0ef9, 0x11f0},
-    {0x0efa, 0x11f9},
-    {0x0eff, 0x20a9},
+    { 0x01a1, 0x0104 },
+    { 0x01a2, 0x02d8 },
+    { 0x01a3, 0x0141 },
+    { 0x01a5, 0x013d },
+    { 0x01a6, 0x015a },
+    { 0x01a9, 0x0160 },
+    { 0x01aa, 0x015e },
+    { 0x01ab, 0x0164 },
+    { 0x01ac, 0x0179 },
+    { 0x01ae, 0x017d },
+    { 0x01af, 0x017b },
+    { 0x01b1, 0x0105 },
+    { 0x01b2, 0x02db },
+    { 0x01b3, 0x0142 },
+    { 0x01b5, 0x013e },
+    { 0x01b6, 0x015b },
+    { 0x01b7, 0x02c7 },
+    { 0x01b9, 0x0161 },
+    { 0x01ba, 0x015f },
+    { 0x01bb, 0x0165 },
+    { 0x01bc, 0x017a },
+    { 0x01bd, 0x02dd },
+    { 0x01be, 0x017e },
+    { 0x01bf, 0x017c },
+    { 0x01c0, 0x0154 },
+    { 0x01c3, 0x0102 },
+    { 0x01c5, 0x0139 },
+    { 0x01c6, 0x0106 },
+    { 0x01c8, 0x010c },
+    { 0x01ca, 0x0118 },
+    { 0x01cc, 0x011a },
+    { 0x01cf, 0x010e },
+    { 0x01d0, 0x0110 },
+    { 0x01d1, 0x0143 },
+    { 0x01d2, 0x0147 },
+    { 0x01d5, 0x0150 },
+    { 0x01d8, 0x0158 },
+    { 0x01d9, 0x016e },
+    { 0x01db, 0x0170 },
+    { 0x01de, 0x0162 },
+    { 0x01e0, 0x0155 },
+    { 0x01e3, 0x0103 },
+    { 0x01e5, 0x013a },
+    { 0x01e6, 0x0107 },
+    { 0x01e8, 0x010d },
+    { 0x01ea, 0x0119 },
+    { 0x01ec, 0x011b },
+    { 0x01ef, 0x010f },
+    { 0x01f0, 0x0111 },
+    { 0x01f1, 0x0144 },
+    { 0x01f2, 0x0148 },
+    { 0x01f5, 0x0151 },
+    { 0x01f8, 0x0159 },
+    { 0x01f9, 0x016f },
+    { 0x01fb, 0x0171 },
+    { 0x01fe, 0x0163 },
+    { 0x01ff, 0x02d9 },
+    { 0x02a1, 0x0126 },
+    { 0x02a6, 0x0124 },
+    { 0x02a9, 0x0130 },
+    { 0x02ab, 0x011e },
+    { 0x02ac, 0x0134 },
+    { 0x02b1, 0x0127 },
+    { 0x02b6, 0x0125 },
+    { 0x02b9, 0x0131 },
+    { 0x02bb, 0x011f },
+    { 0x02bc, 0x0135 },
+    { 0x02c5, 0x010a },
+    { 0x02c6, 0x0108 },
+    { 0x02d5, 0x0120 },
+    { 0x02d8, 0x011c },
+    { 0x02dd, 0x016c },
+    { 0x02de, 0x015c },
+    { 0x02e5, 0x010b },
+    { 0x02e6, 0x0109 },
+    { 0x02f5, 0x0121 },
+    { 0x02f8, 0x011d },
+    { 0x02fd, 0x016d },
+    { 0x02fe, 0x015d },
+    { 0x03a2, 0x0138 },
+    { 0x03a3, 0x0156 },
+    { 0x03a5, 0x0128 },
+    { 0x03a6, 0x013b },
+    { 0x03aa, 0x0112 },
+    { 0x03ab, 0x0122 },
+    { 0x03ac, 0x0166 },
+    { 0x03b3, 0x0157 },
+    { 0x03b5, 0x0129 },
+    { 0x03b6, 0x013c },
+    { 0x03ba, 0x0113 },
+    { 0x03bb, 0x0123 },
+    { 0x03bc, 0x0167 },
+    { 0x03bd, 0x014a },
+    { 0x03bf, 0x014b },
+    { 0x03c0, 0x0100 },
+    { 0x03c7, 0x012e },
+    { 0x03cc, 0x0116 },
+    { 0x03cf, 0x012a },
+    { 0x03d1, 0x0145 },
+    { 0x03d2, 0x014c },
+    { 0x03d3, 0x0136 },
+    { 0x03d9, 0x0172 },
+    { 0x03dd, 0x0168 },
+    { 0x03de, 0x016a },
+    { 0x03e0, 0x0101 },
+    { 0x03e7, 0x012f },
+    { 0x03ec, 0x0117 },
+    { 0x03ef, 0x012b },
+    { 0x03f1, 0x0146 },
+    { 0x03f2, 0x014d },
+    { 0x03f3, 0x0137 },
+    { 0x03f9, 0x0173 },
+    { 0x03fd, 0x0169 },
+    { 0x03fe, 0x016b },
+    { 0x047e, 0x203e },
+    { 0x04a1, 0x3002 },
+    { 0x04a2, 0x300c },
+    { 0x04a3, 0x300d },
+    { 0x04a4, 0x3001 },
+    { 0x04a5, 0x30fb },
+    { 0x04a6, 0x30f2 },
+    { 0x04a7, 0x30a1 },
+    { 0x04a8, 0x30a3 },
+    { 0x04a9, 0x30a5 },
+    { 0x04aa, 0x30a7 },
+    { 0x04ab, 0x30a9 },
+    { 0x04ac, 0x30e3 },
+    { 0x04ad, 0x30e5 },
+    { 0x04ae, 0x30e7 },
+    { 0x04af, 0x30c3 },
+    { 0x04b0, 0x30fc },
+    { 0x04b1, 0x30a2 },
+    { 0x04b2, 0x30a4 },
+    { 0x04b3, 0x30a6 },
+    { 0x04b4, 0x30a8 },
+    { 0x04b5, 0x30aa },
+    { 0x04b6, 0x30ab },
+    { 0x04b7, 0x30ad },
+    { 0x04b8, 0x30af },
+    { 0x04b9, 0x30b1 },
+    { 0x04ba, 0x30b3 },
+    { 0x04bb, 0x30b5 },
+    { 0x04bc, 0x30b7 },
+    { 0x04bd, 0x30b9 },
+    { 0x04be, 0x30bb },
+    { 0x04bf, 0x30bd },
+    { 0x04c0, 0x30bf },
+    { 0x04c1, 0x30c1 },
+    { 0x04c2, 0x30c4 },
+    { 0x04c3, 0x30c6 },
+    { 0x04c4, 0x30c8 },
+    { 0x04c5, 0x30ca },
+    { 0x04c6, 0x30cb },
+    { 0x04c7, 0x30cc },
+    { 0x04c8, 0x30cd },
+    { 0x04c9, 0x30ce },
+    { 0x04ca, 0x30cf },
+    { 0x04cb, 0x30d2 },
+    { 0x04cc, 0x30d5 },
+    { 0x04cd, 0x30d8 },
+    { 0x04ce, 0x30db },
+    { 0x04cf, 0x30de },
+    { 0x04d0, 0x30df },
+    { 0x04d1, 0x30e0 },
+    { 0x04d2, 0x30e1 },
+    { 0x04d3, 0x30e2 },
+    { 0x04d4, 0x30e4 },
+    { 0x04d5, 0x30e6 },
+    { 0x04d6, 0x30e8 },
+    { 0x04d7, 0x30e9 },
+    { 0x04d8, 0x30ea },
+    { 0x04d9, 0x30eb },
+    { 0x04da, 0x30ec },
+    { 0x04db, 0x30ed },
+    { 0x04dc, 0x30ef },
+    { 0x04dd, 0x30f3 },
+    { 0x04de, 0x309b },
+    { 0x04df, 0x309c },
+    { 0x05ac, 0x060c },
+    { 0x05bb, 0x061b },
+    { 0x05bf, 0x061f },
+    { 0x05c1, 0x0621 },
+    { 0x05c2, 0x0622 },
+    { 0x05c3, 0x0623 },
+    { 0x05c4, 0x0624 },
+    { 0x05c5, 0x0625 },
+    { 0x05c6, 0x0626 },
+    { 0x05c7, 0x0627 },
+    { 0x05c8, 0x0628 },
+    { 0x05c9, 0x0629 },
+    { 0x05ca, 0x062a },
+    { 0x05cb, 0x062b },
+    { 0x05cc, 0x062c },
+    { 0x05cd, 0x062d },
+    { 0x05ce, 0x062e },
+    { 0x05cf, 0x062f },
+    { 0x05d0, 0x0630 },
+    { 0x05d1, 0x0631 },
+    { 0x05d2, 0x0632 },
+    { 0x05d3, 0x0633 },
+    { 0x05d4, 0x0634 },
+    { 0x05d5, 0x0635 },
+    { 0x05d6, 0x0636 },
+    { 0x05d7, 0x0637 },
+    { 0x05d8, 0x0638 },
+    { 0x05d9, 0x0639 },
+    { 0x05da, 0x063a },
+    { 0x05e0, 0x0640 },
+    { 0x05e1, 0x0641 },
+    { 0x05e2, 0x0642 },
+    { 0x05e3, 0x0643 },
+    { 0x05e4, 0x0644 },
+    { 0x05e5, 0x0645 },
+    { 0x05e6, 0x0646 },
+    { 0x05e7, 0x0647 },
+    { 0x05e8, 0x0648 },
+    { 0x05e9, 0x0649 },
+    { 0x05ea, 0x064a },
+    { 0x05eb, 0x064b },
+    { 0x05ec, 0x064c },
+    { 0x05ed, 0x064d },
+    { 0x05ee, 0x064e },
+    { 0x05ef, 0x064f },
+    { 0x05f0, 0x0650 },
+    { 0x05f1, 0x0651 },
+    { 0x05f2, 0x0652 },
+    { 0x06a1, 0x0452 },
+    { 0x06a2, 0x0453 },
+    { 0x06a3, 0x0451 },
+    { 0x06a4, 0x0454 },
+    { 0x06a5, 0x0455 },
+    { 0x06a6, 0x0456 },
+    { 0x06a7, 0x0457 },
+    { 0x06a8, 0x0458 },
+    { 0x06a9, 0x0459 },
+    { 0x06aa, 0x045a },
+    { 0x06ab, 0x045b },
+    { 0x06ac, 0x045c },
+    { 0x06ae, 0x045e },
+    { 0x06af, 0x045f },
+    { 0x06b0, 0x2116 },
+    { 0x06b1, 0x0402 },
+    { 0x06b2, 0x0403 },
+    { 0x06b3, 0x0401 },
+    { 0x06b4, 0x0404 },
+    { 0x06b5, 0x0405 },
+    { 0x06b6, 0x0406 },
+    { 0x06b7, 0x0407 },
+    { 0x06b8, 0x0408 },
+    { 0x06b9, 0x0409 },
+    { 0x06ba, 0x040a },
+    { 0x06bb, 0x040b },
+    { 0x06bc, 0x040c },
+    { 0x06be, 0x040e },
+    { 0x06bf, 0x040f },
+    { 0x06c0, 0x044e },
+    { 0x06c1, 0x0430 },
+    { 0x06c2, 0x0431 },
+    { 0x06c3, 0x0446 },
+    { 0x06c4, 0x0434 },
+    { 0x06c5, 0x0435 },
+    { 0x06c6, 0x0444 },
+    { 0x06c7, 0x0433 },
+    { 0x06c8, 0x0445 },
+    { 0x06c9, 0x0438 },
+    { 0x06ca, 0x0439 },
+    { 0x06cb, 0x043a },
+    { 0x06cc, 0x043b },
+    { 0x06cd, 0x043c },
+    { 0x06ce, 0x043d },
+    { 0x06cf, 0x043e },
+    { 0x06d0, 0x043f },
+    { 0x06d1, 0x044f },
+    { 0x06d2, 0x0440 },
+    { 0x06d3, 0x0441 },
+    { 0x06d4, 0x0442 },
+    { 0x06d5, 0x0443 },
+    { 0x06d6, 0x0436 },
+    { 0x06d7, 0x0432 },
+    { 0x06d8, 0x044c },
+    { 0x06d9, 0x044b },
+    { 0x06da, 0x0437 },
+    { 0x06db, 0x0448 },
+    { 0x06dc, 0x044d },
+    { 0x06dd, 0x0449 },
+    { 0x06de, 0x0447 },
+    { 0x06df, 0x044a },
+    { 0x06e0, 0x042e },
+    { 0x06e1, 0x0410 },
+    { 0x06e2, 0x0411 },
+    { 0x06e3, 0x0426 },
+    { 0x06e4, 0x0414 },
+    { 0x06e5, 0x0415 },
+    { 0x06e6, 0x0424 },
+    { 0x06e7, 0x0413 },
+    { 0x06e8, 0x0425 },
+    { 0x06e9, 0x0418 },
+    { 0x06ea, 0x0419 },
+    { 0x06eb, 0x041a },
+    { 0x06ec, 0x041b },
+    { 0x06ed, 0x041c },
+    { 0x06ee, 0x041d },
+    { 0x06ef, 0x041e },
+    { 0x06f0, 0x041f },
+    { 0x06f1, 0x042f },
+    { 0x06f2, 0x0420 },
+    { 0x06f3, 0x0421 },
+    { 0x06f4, 0x0422 },
+    { 0x06f5, 0x0423 },
+    { 0x06f6, 0x0416 },
+    { 0x06f7, 0x0412 },
+    { 0x06f8, 0x042c },
+    { 0x06f9, 0x042b },
+    { 0x06fa, 0x0417 },
+    { 0x06fb, 0x0428 },
+    { 0x06fc, 0x042d },
+    { 0x06fd, 0x0429 },
+    { 0x06fe, 0x0427 },
+    { 0x06ff, 0x042a },
+    { 0x07a1, 0x0386 },
+    { 0x07a2, 0x0388 },
+    { 0x07a3, 0x0389 },
+    { 0x07a4, 0x038a },
+    { 0x07a5, 0x03aa },
+    { 0x07a7, 0x038c },
+    { 0x07a8, 0x038e },
+    { 0x07a9, 0x03ab },
+    { 0x07ab, 0x038f },
+    { 0x07ae, 0x0385 },
+    { 0x07af, 0x2015 },
+    { 0x07b1, 0x03ac },
+    { 0x07b2, 0x03ad },
+    { 0x07b3, 0x03ae },
+    { 0x07b4, 0x03af },
+    { 0x07b5, 0x03ca },
+    { 0x07b6, 0x0390 },
+    { 0x07b7, 0x03cc },
+    { 0x07b8, 0x03cd },
+    { 0x07b9, 0x03cb },
+    { 0x07ba, 0x03b0 },
+    { 0x07bb, 0x03ce },
+    { 0x07c1, 0x0391 },
+    { 0x07c2, 0x0392 },
+    { 0x07c3, 0x0393 },
+    { 0x07c4, 0x0394 },
+    { 0x07c5, 0x0395 },
+    { 0x07c6, 0x0396 },
+    { 0x07c7, 0x0397 },
+    { 0x07c8, 0x0398 },
+    { 0x07c9, 0x0399 },
+    { 0x07ca, 0x039a },
+    { 0x07cb, 0x039b },
+    { 0x07cc, 0x039c },
+    { 0x07cd, 0x039d },
+    { 0x07ce, 0x039e },
+    { 0x07cf, 0x039f },
+    { 0x07d0, 0x03a0 },
+    { 0x07d1, 0x03a1 },
+    { 0x07d2, 0x03a3 },
+    { 0x07d4, 0x03a4 },
+    { 0x07d5, 0x03a5 },
+    { 0x07d6, 0x03a6 },
+    { 0x07d7, 0x03a7 },
+    { 0x07d8, 0x03a8 },
+    { 0x07d9, 0x03a9 },
+    { 0x07e1, 0x03b1 },
+    { 0x07e2, 0x03b2 },
+    { 0x07e3, 0x03b3 },
+    { 0x07e4, 0x03b4 },
+    { 0x07e5, 0x03b5 },
+    { 0x07e6, 0x03b6 },
+    { 0x07e7, 0x03b7 },
+    { 0x07e8, 0x03b8 },
+    { 0x07e9, 0x03b9 },
+    { 0x07ea, 0x03ba },
+    { 0x07eb, 0x03bb },
+    { 0x07ec, 0x03bc },
+    { 0x07ed, 0x03bd },
+    { 0x07ee, 0x03be },
+    { 0x07ef, 0x03bf },
+    { 0x07f0, 0x03c0 },
+    { 0x07f1, 0x03c1 },
+    { 0x07f2, 0x03c3 },
+    { 0x07f3, 0x03c2 },
+    { 0x07f4, 0x03c4 },
+    { 0x07f5, 0x03c5 },
+    { 0x07f6, 0x03c6 },
+    { 0x07f7, 0x03c7 },
+    { 0x07f8, 0x03c8 },
+    { 0x07f9, 0x03c9 },
+    { 0x08a1, 0x23b7 },
+    { 0x08a2, 0x250c },
+    { 0x08a3, 0x2500 },
+    { 0x08a4, 0x2320 },
+    { 0x08a5, 0x2321 },
+    { 0x08a6, 0x2502 },
+    { 0x08a7, 0x23a1 },
+    { 0x08a8, 0x23a3 },
+    { 0x08a9, 0x23a4 },
+    { 0x08aa, 0x23a6 },
+    { 0x08ab, 0x239b },
+    { 0x08ac, 0x239d },
+    { 0x08ad, 0x239e },
+    { 0x08ae, 0x23a0 },
+    { 0x08af, 0x23a8 },
+    { 0x08b0, 0x23ac },
+    { 0x08bc, 0x2264 },
+    { 0x08bd, 0x2260 },
+    { 0x08be, 0x2265 },
+    { 0x08bf, 0x222b },
+    { 0x08c0, 0x2234 },
+    { 0x08c1, 0x221d },
+    { 0x08c2, 0x221e },
+    { 0x08c5, 0x2207 },
+    { 0x08c8, 0x223c },
+    { 0x08c9, 0x2243 },
+    { 0x08cd, 0x21d4 },
+    { 0x08ce, 0x21d2 },
+    { 0x08cf, 0x2261 },
+    { 0x08d6, 0x221a },
+    { 0x08da, 0x2282 },
+    { 0x08db, 0x2283 },
+    { 0x08dc, 0x2229 },
+    { 0x08dd, 0x222a },
+    { 0x08de, 0x2227 },
+    { 0x08df, 0x2228 },
+    { 0x08ef, 0x2202 },
+    { 0x08f6, 0x0192 },
+    { 0x08fb, 0x2190 },
+    { 0x08fc, 0x2191 },
+    { 0x08fd, 0x2192 },
+    { 0x08fe, 0x2193 },
+    { 0x09e0, 0x25c6 },
+    { 0x09e1, 0x2592 },
+    { 0x09e2, 0x2409 },
+    { 0x09e3, 0x240c },
+    { 0x09e4, 0x240d },
+    { 0x09e5, 0x240a },
+    { 0x09e8, 0x2424 },
+    { 0x09e9, 0x240b },
+    { 0x09ea, 0x2518 },
+    { 0x09eb, 0x2510 },
+    { 0x09ec, 0x250c },
+    { 0x09ed, 0x2514 },
+    { 0x09ee, 0x253c },
+    { 0x09ef, 0x23ba },
+    { 0x09f0, 0x23bb },
+    { 0x09f1, 0x2500 },
+    { 0x09f2, 0x23bc },
+    { 0x09f3, 0x23bd },
+    { 0x09f4, 0x251c },
+    { 0x09f5, 0x2524 },
+    { 0x09f6, 0x2534 },
+    { 0x09f7, 0x252c },
+    { 0x09f8, 0x2502 },
+    { 0x0aa1, 0x2003 },
+    { 0x0aa2, 0x2002 },
+    { 0x0aa3, 0x2004 },
+    { 0x0aa4, 0x2005 },
+    { 0x0aa5, 0x2007 },
+    { 0x0aa6, 0x2008 },
+    { 0x0aa7, 0x2009 },
+    { 0x0aa8, 0x200a },
+    { 0x0aa9, 0x2014 },
+    { 0x0aaa, 0x2013 },
+    { 0x0aae, 0x2026 },
+    { 0x0aaf, 0x2025 },
+    { 0x0ab0, 0x2153 },
+    { 0x0ab1, 0x2154 },
+    { 0x0ab2, 0x2155 },
+    { 0x0ab3, 0x2156 },
+    { 0x0ab4, 0x2157 },
+    { 0x0ab5, 0x2158 },
+    { 0x0ab6, 0x2159 },
+    { 0x0ab7, 0x215a },
+    { 0x0ab8, 0x2105 },
+    { 0x0abb, 0x2012 },
+    { 0x0abc, 0x2329 },
+    { 0x0abe, 0x232a },
+    { 0x0ac3, 0x215b },
+    { 0x0ac4, 0x215c },
+    { 0x0ac5, 0x215d },
+    { 0x0ac6, 0x215e },
+    { 0x0ac9, 0x2122 },
+    { 0x0aca, 0x2613 },
+    { 0x0acc, 0x25c1 },
+    { 0x0acd, 0x25b7 },
+    { 0x0ace, 0x25cb },
+    { 0x0acf, 0x25af },
+    { 0x0ad0, 0x2018 },
+    { 0x0ad1, 0x2019 },
+    { 0x0ad2, 0x201c },
+    { 0x0ad3, 0x201d },
+    { 0x0ad4, 0x211e },
+    { 0x0ad6, 0x2032 },
+    { 0x0ad7, 0x2033 },
+    { 0x0ad9, 0x271d },
+    { 0x0adb, 0x25ac },
+    { 0x0adc, 0x25c0 },
+    { 0x0add, 0x25b6 },
+    { 0x0ade, 0x25cf },
+    { 0x0adf, 0x25ae },
+    { 0x0ae0, 0x25e6 },
+    { 0x0ae1, 0x25ab },
+    { 0x0ae2, 0x25ad },
+    { 0x0ae3, 0x25b3 },
+    { 0x0ae4, 0x25bd },
+    { 0x0ae5, 0x2606 },
+    { 0x0ae6, 0x2022 },
+    { 0x0ae7, 0x25aa },
+    { 0x0ae8, 0x25b2 },
+    { 0x0ae9, 0x25bc },
+    { 0x0aea, 0x261c },
+    { 0x0aeb, 0x261e },
+    { 0x0aec, 0x2663 },
+    { 0x0aed, 0x2666 },
+    { 0x0aee, 0x2665 },
+    { 0x0af0, 0x2720 },
+    { 0x0af1, 0x2020 },
+    { 0x0af2, 0x2021 },
+    { 0x0af3, 0x2713 },
+    { 0x0af4, 0x2717 },
+    { 0x0af5, 0x266f },
+    { 0x0af6, 0x266d },
+    { 0x0af7, 0x2642 },
+    { 0x0af8, 0x2640 },
+    { 0x0af9, 0x260e },
+    { 0x0afa, 0x2315 },
+    { 0x0afb, 0x2117 },
+    { 0x0afc, 0x2038 },
+    { 0x0afd, 0x201a },
+    { 0x0afe, 0x201e },
+    { 0x0ba3, 0x003c },
+    { 0x0ba6, 0x003e },
+    { 0x0ba8, 0x2228 },
+    { 0x0ba9, 0x2227 },
+    { 0x0bc0, 0x00af },
+    { 0x0bc2, 0x22a5 },
+    { 0x0bc3, 0x2229 },
+    { 0x0bc4, 0x230a },
+    { 0x0bc6, 0x005f },
+    { 0x0bca, 0x2218 },
+    { 0x0bcc, 0x2395 },
+    { 0x0bce, 0x22a4 },
+    { 0x0bcf, 0x25cb },
+    { 0x0bd3, 0x2308 },
+    { 0x0bd6, 0x222a },
+    { 0x0bd8, 0x2283 },
+    { 0x0bda, 0x2282 },
+    { 0x0bdc, 0x22a2 },
+    { 0x0bfc, 0x22a3 },
+    { 0x0cdf, 0x2017 },
+    { 0x0ce0, 0x05d0 },
+    { 0x0ce1, 0x05d1 },
+    { 0x0ce2, 0x05d2 },
+    { 0x0ce3, 0x05d3 },
+    { 0x0ce4, 0x05d4 },
+    { 0x0ce5, 0x05d5 },
+    { 0x0ce6, 0x05d6 },
+    { 0x0ce7, 0x05d7 },
+    { 0x0ce8, 0x05d8 },
+    { 0x0ce9, 0x05d9 },
+    { 0x0cea, 0x05da },
+    { 0x0ceb, 0x05db },
+    { 0x0cec, 0x05dc },
+    { 0x0ced, 0x05dd },
+    { 0x0cee, 0x05de },
+    { 0x0cef, 0x05df },
+    { 0x0cf0, 0x05e0 },
+    { 0x0cf1, 0x05e1 },
+    { 0x0cf2, 0x05e2 },
+    { 0x0cf3, 0x05e3 },
+    { 0x0cf4, 0x05e4 },
+    { 0x0cf5, 0x05e5 },
+    { 0x0cf6, 0x05e6 },
+    { 0x0cf7, 0x05e7 },
+    { 0x0cf8, 0x05e8 },
+    { 0x0cf9, 0x05e9 },
+    { 0x0cfa, 0x05ea },
+    { 0x0da1, 0x0e01 },
+    { 0x0da2, 0x0e02 },
+    { 0x0da3, 0x0e03 },
+    { 0x0da4, 0x0e04 },
+    { 0x0da5, 0x0e05 },
+    { 0x0da6, 0x0e06 },
+    { 0x0da7, 0x0e07 },
+    { 0x0da8, 0x0e08 },
+    { 0x0da9, 0x0e09 },
+    { 0x0daa, 0x0e0a },
+    { 0x0dab, 0x0e0b },
+    { 0x0dac, 0x0e0c },
+    { 0x0dad, 0x0e0d },
+    { 0x0dae, 0x0e0e },
+    { 0x0daf, 0x0e0f },
+    { 0x0db0, 0x0e10 },
+    { 0x0db1, 0x0e11 },
+    { 0x0db2, 0x0e12 },
+    { 0x0db3, 0x0e13 },
+    { 0x0db4, 0x0e14 },
+    { 0x0db5, 0x0e15 },
+    { 0x0db6, 0x0e16 },
+    { 0x0db7, 0x0e17 },
+    { 0x0db8, 0x0e18 },
+    { 0x0db9, 0x0e19 },
+    { 0x0dba, 0x0e1a },
+    { 0x0dbb, 0x0e1b },
+    { 0x0dbc, 0x0e1c },
+    { 0x0dbd, 0x0e1d },
+    { 0x0dbe, 0x0e1e },
+    { 0x0dbf, 0x0e1f },
+    { 0x0dc0, 0x0e20 },
+    { 0x0dc1, 0x0e21 },
+    { 0x0dc2, 0x0e22 },
+    { 0x0dc3, 0x0e23 },
+    { 0x0dc4, 0x0e24 },
+    { 0x0dc5, 0x0e25 },
+    { 0x0dc6, 0x0e26 },
+    { 0x0dc7, 0x0e27 },
+    { 0x0dc8, 0x0e28 },
+    { 0x0dc9, 0x0e29 },
+    { 0x0dca, 0x0e2a },
+    { 0x0dcb, 0x0e2b },
+    { 0x0dcc, 0x0e2c },
+    { 0x0dcd, 0x0e2d },
+    { 0x0dce, 0x0e2e },
+    { 0x0dcf, 0x0e2f },
+    { 0x0dd0, 0x0e30 },
+    { 0x0dd1, 0x0e31 },
+    { 0x0dd2, 0x0e32 },
+    { 0x0dd3, 0x0e33 },
+    { 0x0dd4, 0x0e34 },
+    { 0x0dd5, 0x0e35 },
+    { 0x0dd6, 0x0e36 },
+    { 0x0dd7, 0x0e37 },
+    { 0x0dd8, 0x0e38 },
+    { 0x0dd9, 0x0e39 },
+    { 0x0dda, 0x0e3a },
+    { 0x0ddf, 0x0e3f },
+    { 0x0de0, 0x0e40 },
+    { 0x0de1, 0x0e41 },
+    { 0x0de2, 0x0e42 },
+    { 0x0de3, 0x0e43 },
+    { 0x0de4, 0x0e44 },
+    { 0x0de5, 0x0e45 },
+    { 0x0de6, 0x0e46 },
+    { 0x0de7, 0x0e47 },
+    { 0x0de8, 0x0e48 },
+    { 0x0de9, 0x0e49 },
+    { 0x0dea, 0x0e4a },
+    { 0x0deb, 0x0e4b },
+    { 0x0dec, 0x0e4c },
+    { 0x0ded, 0x0e4d },
+    { 0x0df0, 0x0e50 },
+    { 0x0df1, 0x0e51 },
+    { 0x0df2, 0x0e52 },
+    { 0x0df3, 0x0e53 },
+    { 0x0df4, 0x0e54 },
+    { 0x0df5, 0x0e55 },
+    { 0x0df6, 0x0e56 },
+    { 0x0df7, 0x0e57 },
+    { 0x0df8, 0x0e58 },
+    { 0x0df9, 0x0e59 },
+    { 0x0ea1, 0x3131 },
+    { 0x0ea2, 0x3132 },
+    { 0x0ea3, 0x3133 },
+    { 0x0ea4, 0x3134 },
+    { 0x0ea5, 0x3135 },
+    { 0x0ea6, 0x3136 },
+    { 0x0ea7, 0x3137 },
+    { 0x0ea8, 0x3138 },
+    { 0x0ea9, 0x3139 },
+    { 0x0eaa, 0x313a },
+    { 0x0eab, 0x313b },
+    { 0x0eac, 0x313c },
+    { 0x0ead, 0x313d },
+    { 0x0eae, 0x313e },
+    { 0x0eaf, 0x313f },
+    { 0x0eb0, 0x3140 },
+    { 0x0eb1, 0x3141 },
+    { 0x0eb2, 0x3142 },
+    { 0x0eb3, 0x3143 },
+    { 0x0eb4, 0x3144 },
+    { 0x0eb5, 0x3145 },
+    { 0x0eb6, 0x3146 },
+    { 0x0eb7, 0x3147 },
+    { 0x0eb8, 0x3148 },
+    { 0x0eb9, 0x3149 },
+    { 0x0eba, 0x314a },
+    { 0x0ebb, 0x314b },
+    { 0x0ebc, 0x314c },
+    { 0x0ebd, 0x314d },
+    { 0x0ebe, 0x314e },
+    { 0x0ebf, 0x314f },
+    { 0x0ec0, 0x3150 },
+    { 0x0ec1, 0x3151 },
+    { 0x0ec2, 0x3152 },
+    { 0x0ec3, 0x3153 },
+    { 0x0ec4, 0x3154 },
+    { 0x0ec5, 0x3155 },
+    { 0x0ec6, 0x3156 },
+    { 0x0ec7, 0x3157 },
+    { 0x0ec8, 0x3158 },
+    { 0x0ec9, 0x3159 },
+    { 0x0eca, 0x315a },
+    { 0x0ecb, 0x315b },
+    { 0x0ecc, 0x315c },
+    { 0x0ecd, 0x315d },
+    { 0x0ece, 0x315e },
+    { 0x0ecf, 0x315f },
+    { 0x0ed0, 0x3160 },
+    { 0x0ed1, 0x3161 },
+    { 0x0ed2, 0x3162 },
+    { 0x0ed3, 0x3163 },
+    { 0x0ed4, 0x11a8 },
+    { 0x0ed5, 0x11a9 },
+    { 0x0ed6, 0x11aa },
+    { 0x0ed7, 0x11ab },
+    { 0x0ed8, 0x11ac },
+    { 0x0ed9, 0x11ad },
+    { 0x0eda, 0x11ae },
+    { 0x0edb, 0x11af },
+    { 0x0edc, 0x11b0 },
+    { 0x0edd, 0x11b1 },
+    { 0x0ede, 0x11b2 },
+    { 0x0edf, 0x11b3 },
+    { 0x0ee0, 0x11b4 },
+    { 0x0ee1, 0x11b5 },
+    { 0x0ee2, 0x11b6 },
+    { 0x0ee3, 0x11b7 },
+    { 0x0ee4, 0x11b8 },
+    { 0x0ee5, 0x11b9 },
+    { 0x0ee6, 0x11ba },
+    { 0x0ee7, 0x11bb },
+    { 0x0ee8, 0x11bc },
+    { 0x0ee9, 0x11bd },
+    { 0x0eea, 0x11be },
+    { 0x0eeb, 0x11bf },
+    { 0x0eec, 0x11c0 },
+    { 0x0eed, 0x11c1 },
+    { 0x0eee, 0x11c2 },
+    { 0x0eef, 0x316d },
+    { 0x0ef0, 0x3171 },
+    { 0x0ef1, 0x3178 },
+    { 0x0ef2, 0x317f },
+    { 0x0ef3, 0x3181 },
+    { 0x0ef4, 0x3184 },
+    { 0x0ef5, 0x3186 },
+    { 0x0ef6, 0x318d },
+    { 0x0ef7, 0x318e },
+    { 0x0ef8, 0x11eb },
+    { 0x0ef9, 0x11f0 },
+    { 0x0efa, 0x11f9 },
+    { 0x0eff, 0x20a9 },
 #if 0
     /* FIXME: there is no keysym 0x13a4? But 0x20ac is EuroSign in both
        keysym and Unicode */
-    {0x13a4, 0x20ac},
+    { 0x13a4, 0x20ac },
 #endif
-    {0x13bc, 0x0152},
-    {0x13bd, 0x0153},
-    {0x13be, 0x0178},
-    {0x20ac, 0x20ac},
+    { 0x13bc, 0x0152 },
+    { 0x13bd, 0x0153 },
+    { 0x13be, 0x0178 },
+    { 0x20ac, 0x20ac },
 
     /* Special function keys. */
 
-    {0xff08, 0x0008},           /* XK_BackSpace */
-    {0xff09, 0x0009},           /* XK_Tab */
-    {0xff0a, 0x000a},           /* XK_Linefeed */
-    {0xff0d, 0x000d},           /* XK_Return */
-    {0xff13, 0x0013},           /* XK_Pause */
-    {0xff1b, 0x001b},           /* XK_Escape */
-    {0xff50, 0x0001},           /* XK_Home */
-    {0xff51, 0x001c},           /* XK_Left */
-    {0xff52, 0x001e},           /* XK_Up */
-    {0xff53, 0x001d},           /* XK_Right */
-    {0xff54, 0x001f},           /* XK_Down */
-    {0xff55, 0x000b},           /* XK_Prior */
-    {0xff56, 0x000c},           /* XK_Next */
-    {0xff57, 0x0004},           /* XK_End */
-    {0xff6a, 0x0005},           /* XK_Help */
-    {0xffff, 0x007f},           /* XK_Delete */
+    { 0xff08, 0x0008 }, /* XK_BackSpace */
+    { 0xff09, 0x0009 }, /* XK_Tab */
+    { 0xff0a, 0x000a }, /* XK_Linefeed */
+    { 0xff0d, 0x000d }, /* XK_Return */
+    { 0xff13, 0x0013 }, /* XK_Pause */
+    { 0xff1b, 0x001b }, /* XK_Escape */
+    { 0xff50, 0x0001 }, /* XK_Home */
+    { 0xff51, 0x001c }, /* XK_Left */
+    { 0xff52, 0x001e }, /* XK_Up */
+    { 0xff53, 0x001d }, /* XK_Right */
+    { 0xff54, 0x001f }, /* XK_Down */
+    { 0xff55, 0x000b }, /* XK_Prior */
+    { 0xff56, 0x000c }, /* XK_Next */
+    { 0xff57, 0x0004 }, /* XK_End */
+    { 0xff6a, 0x0005 }, /* XK_Help */
+    { 0xffff, 0x007f }, /* XK_Delete */
 };
 
 long
@@ -884,11 +884,13 @@ ucs2keysym(long ucs)
 
         qsort(reverse_keysymtab,
               sizeof(keysymtab) / sizeof(struct codepair),
-              sizeof(struct codepair), reverse_compare);
+              sizeof(struct codepair),
+              reverse_compare);
     }
 
     /* first check for Latin-1 characters (1:1 mapping) */
-    if ((ucs >= 0x0020 && ucs <= 0x007e) || (ucs >= 0x00a0 && ucs <= 0x00ff))
+    if ((ucs >= 0x0020 && ucs <= 0x007e) ||
+        (ucs >= 0x00a0 && ucs <= 0x00ff))
         return ucs;
 
     /* binary search in table */
diff --git a/xorg-server/hw/xquartz/keysym2ucs.h b/xorg-server/hw/xquartz/keysym2ucs.h
index f5b7a18f2..01af0371d 100644
--- a/xorg-server/hw/xquartz/keysym2ucs.h
+++ b/xorg-server/hw/xquartz/keysym2ucs.h
@@ -30,7 +30,9 @@
 #ifndef KEYSYM2UCS_H
 #define KEYSYM2UCS_H 1
 
-extern long keysym2ucs(int keysym);
-extern int ucs2keysym(long ucs);
+extern long
+keysym2ucs(int keysym);
+extern int
+ucs2keysym(long ucs);
 
 #endif /* KEYSYM2UCS_H */
diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index 7a53803da..d1ad6f7e3 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -1,32 +1,32 @@
 /* main.c -- X application launcher
- 
- Copyright (c) 2007 Jeremy Huddleston
- Copyright (c) 2007 Apple Inc
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- 
- The above copyright notice and this permission notice 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 ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
+ * Copyright (c) 2007 Jeremy Huddleston
+ * Copyright (c) 2007-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <AvailabilityMacros.h>
@@ -64,18 +64,16 @@
 #include "console_redirect.h"
 
 /* From darwinEvents.c ... but don't want to pull in all the server cruft */
-void DarwinListenOnOpenFD(int fd);
+void
+DarwinListenOnOpenFD(int fd);
 
 extern aslclient aslc;
 
 /* Ditto, from os/log.c */
 extern void
-ErrorF(const char *f, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);
+ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2);
 extern void
-FatalError(const char *f, ...)
-_X_ATTRIBUTE_PRINTF(1, 2)
-    _X_NORETURN;
+FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
 
 extern int noPanoramiXExtension;
 
@@ -91,14 +89,13 @@ extern int noPanoramiXExtension;
 #endif
 
 static char __crashreporter_info_buff__[4096] = { 0 };
-
-static const char *__crashreporter_info__ __attribute__ ((__used__)) =
+static const char *__crashreporter_info__ __attribute__((__used__)) =
     &__crashreporter_info_buff__[0];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 // This is actually a toolchain requirement, but I'm not sure the correct check,
 // but it should be fine to just only include it for Leopard and later.  This line
 // just tells the linker to never strip this symbol (such as for space optimization)
-asm(".desc ___crashreporter_info__, 0x10");
+asm (".desc ___crashreporter_info__, 0x10");
 #endif
 
 static const char *__crashreporter_info__base =
@@ -110,10 +107,13 @@ static char *server_bootstrap_name = NULL;
 #define DEBUG 1
 
 /* This is in quartzStartup.c */
-int server_main(int argc, char **argv, char **envp);
+int
+server_main(int argc, char **argv, char **envp);
 
-static int execute(const char *command);
-static char *command_from_prefs(const char *key, const char *default_value);
+static int
+execute(const char *command);
+static char *
+command_from_prefs(const char *key, const char *default_value);
 
 static char *pref_app_to_run;
 static char *pref_login_shell;
@@ -122,7 +122,7 @@ static char *pref_startx_script;
 #ifndef HAVE_LIBDISPATCH
 /*** Pthread Magics ***/
 static pthread_t
-create_thread(void *(*func) (void *), void *arg)
+create_thread(void *(*func)(void *), void *arg)
 {
     pthread_attr_t attr;
     pthread_t tid;
@@ -162,8 +162,8 @@ checkin_or_register(char *bname)
         exit(EXIT_FAILURE);
     }
 
-    kr = mach_port_insert_right(mach_task_self(), mp, mp,
-                                MACH_MSG_TYPE_MAKE_SEND);
+    kr = mach_port_insert_right(
+        mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND);
     if (kr != KERN_SUCCESS) {
         ErrorF("mach_port_insert_right(): %s\n", mach_error_string(kr));
         exit(EXIT_FAILURE);
@@ -171,7 +171,7 @@ checkin_or_register(char *bname)
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // bootstrap_register
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // bootstrap_register
 #endif
     kr = bootstrap_register(bootstrap_port, bname, mp);
 #ifdef __clang__
@@ -221,16 +221,16 @@ accept_fd_handoff(int connected_fd)
 
     msg.msg_controllen = cmsg->cmsg_len;
 
-    *((int *) CMSG_DATA(cmsg)) = -1;
+    *((int *)CMSG_DATA(cmsg)) = -1;
 
     if (recvmsg(connected_fd, &msg, 0) < 0) {
-        ErrorF
-            ("X11.app: Error receiving $DISPLAY file descriptor.  recvmsg() error: %s\n",
-             strerror(errno));
+        ErrorF(
+            "X11.app: Error receiving $DISPLAY file descriptor.  recvmsg() error: %s\n",
+            strerror(errno));
         return -1;
     }
 
-    launchd_fd = *((int *) CMSG_DATA(cmsg));
+    launchd_fd = *((int *)CMSG_DATA(cmsg));
 
     return launchd_fd;
 }
@@ -245,13 +245,13 @@ typedef struct {
  */
 #ifdef HAVE_LIBDISPATCH
 static void
-socket_handoff(socket_handoff_t * handoff_data)
+socket_handoff(socket_handoff_t *handoff_data)
 {
 #else
 static void *
 socket_handoff_thread(void *arg)
 {
-    socket_handoff_t *handoff_data = (socket_handoff_t *) arg;
+    socket_handoff_t *handoff_data = (socket_handoff_t *)arg;
 #endif
 
     int launchd_fd = -1;
@@ -263,17 +263,17 @@ socket_handoff_thread(void *arg)
     while (launchd_fd == -1) {
         connected_fd = accept(handoff_data->fd, NULL, NULL);
         if (connected_fd == -1) {
-            ErrorF
-                ("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n",
-                 handoff_data->fd, strerror(errno));
+            ErrorF(
+                "X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n",
+                handoff_data->fd, strerror(errno));
             sleep(2);
             continue;
         }
 
         launchd_fd = accept_fd_handoff(connected_fd);
         if (launchd_fd == -1)
-            ErrorF
-                ("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received?  Waiting for another connection.\n");
+            ErrorF(
+                "X11.app: Error receiving $DISPLAY file descriptor, no descriptor received?  Waiting for another connection.\n");
 
         close(connected_fd);
     }
@@ -282,9 +282,9 @@ socket_handoff_thread(void *arg)
     unlink(handoff_data->filename);
     free(handoff_data);
 
-    ErrorF
-        ("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n",
-         launchd_fd);
+    ErrorF(
+        "X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n",
+        launchd_fd);
     DarwinListenOnOpenFD(launchd_fd);
 
 #ifndef HAVE_LIBDISPATCH
@@ -310,35 +310,38 @@ create_socket(char *filename_out)
         strlcpy(servaddr_un.sun_path, filename_out,
                 sizeof(servaddr_un.sun_path));
 
-        servaddr = (struct sockaddr *) &servaddr_un;
-        servaddr_len =
-            sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) +
-            strlen(filename_out);
+        servaddr = (struct sockaddr *)&servaddr_un;
+        servaddr_len = sizeof(struct sockaddr_un) -
+                       sizeof(servaddr_un.sun_path) + strlen(filename_out);
 
         ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
         if (ret_fd == -1) {
-            ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n",
-                   (int) try + 1, (int) try_max, filename_out, strerror(errno));
+            ErrorF(
+                "X11.app: Failed to create socket (try %d / %d): %s - %s\n",
+                (int)try + 1, (int)try_max, filename_out, strerror(errno));
             continue;
         }
 
         if (bind(ret_fd, servaddr, servaddr_len) != 0) {
             ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno,
-                   strerror(errno));
+                   strerror(
+                       errno));
             close(ret_fd);
             return 0;
         }
 
         if (listen(ret_fd, 10) != 0) {
             ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n",
-                   filename_out, errno, strerror(errno));
+                   filename_out, errno, strerror(
+                       errno));
             close(ret_fd);
             return 0;
         }
 
 #ifdef DEBUG
         ErrorF("X11.app: Listening on socket for fd handoff:  (%d) %s\n",
-               ret_fd, filename_out);
+               ret_fd,
+               filename_out);
 #endif
 
         return ret_fd;
@@ -356,7 +359,7 @@ do_request_fd_handoff_socket(mach_port_t port, string_t filename)
 
     launchd_socket_handed_off = 1;
 
-    handoff_data = (socket_handoff_t *) calloc(1, sizeof(socket_handoff_t));
+    handoff_data = (socket_handoff_t *)calloc(1, sizeof(socket_handoff_t));
     if (!handoff_data) {
         ErrorF("X11.app: Error allocating memory for handoff_data\n");
         return KERN_FAILURE;
@@ -371,17 +374,17 @@ do_request_fd_handoff_socket(mach_port_t port, string_t filename)
     strlcpy(filename, handoff_data->filename, STRING_T_SIZE);
 
 #ifdef HAVE_LIBDISPATCH
-    dispatch_async(dispatch_get_global_queue
-                   (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^ {
-                   socket_handoff(handoff_data);}
-    );
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,
+                                             0), ^ {
+                       socket_handoff(handoff_data);
+                   });
 #else
     create_thread(socket_handoff_thread, handoff_data);
 #endif
 
 #ifdef DEBUG
-    ErrorF
-        ("X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");
+    ErrorF(
+        "X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");
 #endif
 
     return KERN_SUCCESS;
@@ -398,7 +401,8 @@ do_request_pid(mach_port_t port, int *my_pid)
 kern_return_t
 do_start_x11_server(mach_port_t port, string_array_t argv,
                     mach_msg_type_number_t argvCnt,
-                    string_array_t envp, mach_msg_type_number_t envpCnt)
+                    string_array_t envp,
+                    mach_msg_type_number_t envpCnt)
 {
     /* And now back to char ** */
     char **_argv = alloca((argvCnt + 1) * sizeof(char *));
@@ -420,7 +424,7 @@ do_start_x11_server(mach_port_t port, string_array_t argv,
     ErrorF("X11.app: do_start_x11_server(): argc=%d\n", argvCnt);
     for (i = 0; i < argvCnt; i++) {
         _argv[i] = argv[i];
-        ErrorF("\targv[%u] = %s\n", (unsigned) i, argv[i]);
+        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
     }
     _argv[argvCnt] = NULL;
 
@@ -451,14 +455,13 @@ startup_trigger(int argc, char **argv, char **envp)
 
         /* We need to count envp */
         int envpc;
-
-        for (envpc = 0; envp[envpc]; envpc++);
+        for (envpc = 0; envp[envpc]; envpc++) ;
 
         /* We have fixed-size string lengths due to limitations in IPC,
          * so we need to copy our argv and envp.
          */
-        newargv = (string_array_t) alloca(argc * sizeof(string_t));
-        newenvp = (string_array_t) alloca(envpc * sizeof(string_t));
+        newargv = (string_array_t)alloca(argc * sizeof(string_t));
+        newenvp = (string_array_t)alloca(envpc * sizeof(string_t));
 
         if (!newargv || !newenvp) {
             ErrorF("Memory allocation failure\n");
@@ -476,10 +479,11 @@ startup_trigger(int argc, char **argv, char **envp)
         if (kr != KERN_SUCCESS) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
             ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name,
-                   bootstrap_strerror(kr));
+                   bootstrap_strerror(
+                       kr));
 #else
             ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name,
-                   (unsigned long) kr);
+                   (unsigned long)kr);
 #endif
             exit(EXIT_FAILURE);
         }
@@ -508,14 +512,14 @@ startup_trigger(int argc, char **argv, char **envp)
 
     /* Start the server */
     if ((s = getenv("DISPLAY"))) {
-        ErrorF
-            ("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n",
-             s);
+        ErrorF(
+            "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n",
+            s);
         unsetenv("DISPLAY");
     }
     else {
-        ErrorF
-            ("X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
+        ErrorF(
+            "X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
     }
     return execute(pref_startx_script);
 }
@@ -530,7 +534,8 @@ ensure_path(const char *dir)
     temp = getenv("PATH");
     if (temp == NULL || temp[0] == 0) {
         snprintf(buf, sizeof(buf),
-                 "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);
+                 "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s",
+                 dir);
         setenv("PATH", buf, TRUE);
     }
     else if (strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {
@@ -574,10 +579,8 @@ setup_env(void)
      * quartz-wm and the Xquartz stub's MachIPC)
      */
     CFBundleRef bundle = CFBundleGetMainBundle();
-
     if (bundle) {
         CFStringRef pd = CFBundleGetIdentifier(bundle);
-
         if (pd) {
             pds = CFStringGetCStringPtr(pd, 0);
         }
@@ -609,22 +612,22 @@ setup_env(void)
     if (disp) {
         /* s = basename(disp) */
         const char *d, *s;
-
         for (s = NULL, d = disp; *d; d++) {
             if (*d == '/')
                 s = d + 1;
         }
 
         if (s && *s) {
-            if (strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {
-                ErrorF
-                    ("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
+            if (strcmp(bundle_id_prefix,
+                       "org.x") == 0 && strcmp(s, ":0") == 0) {
+                ErrorF(
+                    "X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
             }
             else {
-                temp = (char *) malloc(sizeof(char) * len);
+                temp = (char *)malloc(sizeof(char) * len);
                 if (!temp) {
-                    ErrorF
-                        ("X11.app: Memory allocation error creating space for socket name test.\n");
+                    ErrorF(
+                        "X11.app: Memory allocation error creating space for socket name test.\n");
                     exit(1);
                 }
                 strlcpy(temp, bundle_id_prefix, len);
@@ -632,9 +635,9 @@ setup_env(void)
 
                 if (strcmp(temp, s) != 0) {
                     /* If we don't have a match, unset it. */
-                    ErrorF
-                        ("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n",
-                         disp, bundle_id_prefix);
+                    ErrorF(
+                        "X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n",
+                        disp, bundle_id_prefix);
                     unsetenv("DISPLAY");
                 }
                 free(temp);
@@ -642,8 +645,8 @@ setup_env(void)
         }
         else {
             /* The DISPLAY environment variable is not formatted like a launchd socket, so reset. */
-            ErrorF
-                ("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
+            ErrorF(
+                "X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
             unsetenv("DISPLAY");
         }
     }
@@ -679,7 +682,7 @@ main(int argc, char **argv, char **envp)
 
     ErrorF("X11.app: main(): argc=%d\n", argc);
     for (i = 0; i < argc; i++) {
-        ErrorF("\targv[%u] = %s\n", (unsigned) i, argv[i]);
+        ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
         if (!strcmp(argv[i], "--listenonly")) {
             listenOnly = TRUE;
         }
@@ -704,26 +707,26 @@ main(int argc, char **argv, char **envp)
         pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);
         assert(pref_login_shell);
 
-        pref_startx_script =
-            command_from_prefs("startx_script", DEFAULT_STARTX);
+        pref_startx_script = command_from_prefs("startx_script",
+                                                DEFAULT_STARTX);
         assert(pref_startx_script);
 
         /* Do the fork-twice trick to avoid having to reap zombies */
         child1 = fork();
         switch (child1) {
-        case -1:               /* error */
+        case -1:                                    /* error */
             FatalError("fork() failed: %s\n", strerror(errno));
 
-        case 0:                /* child1 */
+        case 0:                                     /* child1 */
             child2 = fork();
 
             switch (child2) {
                 int max_files;
 
-            case -1:           /* error */
+            case -1:                                    /* error */
                 FatalError("fork() failed: %s\n", strerror(errno));
 
-            case 0:            /* child2 */
+            case 0:                                     /* child2 */
                 /* close all open files except for standard streams */
                 max_files = sysconf(_SC_OPEN_MAX);
                 for (i = 3; i < max_files; i++)
@@ -735,12 +738,12 @@ main(int argc, char **argv, char **envp)
 
                 return startup_trigger(argc, argv, envp);
 
-            default:           /* parent (child1) */
+            default:                                    /* parent (child1) */
                 _exit(0);
             }
             break;
 
-        default:               /* parent */
+        default:                                    /* parent */
             waitpid(child1, &status, 0);
         }
 
@@ -773,10 +776,10 @@ execute(const char *command)
 
     ErrorF("X11.app: Launching %s:\n", command);
     for (p = newargv; *p; p++) {
-        ErrorF("\targv[%ld] = %s\n", (long int) (p - newargv), *p);
+        ErrorF("\targv[%ld] = %s\n", (long int)(p - newargv), *p);
     }
 
-    execvp(newargv[0], (char *const *) newargv);
+    execvp(newargv[0], (char *const *)newargv);
     perror("X11.app: Couldn't exec.");
     return 1;
 }
@@ -797,13 +800,13 @@ command_from_prefs(const char *key, const char *default_value)
     if (!cfKey)
         return NULL;
 
-    PlistRef =
-        CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+    PlistRef = CFPreferencesCopyAppValue(cfKey,
+                                         kCFPreferencesCurrentApplication);
 
-    if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-        CFStringRef cfDefaultValue =
-            CFStringCreateWithCString(NULL, default_value,
-                                      kCFStringEncodingASCII);
+    if ((PlistRef == NULL) ||
+        (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+        CFStringRef cfDefaultValue = CFStringCreateWithCString(
+            NULL, default_value, kCFStringEncodingASCII);
         int len = strlen(default_value) + 1;
 
         if (!cfDefaultValue)
@@ -814,22 +817,21 @@ command_from_prefs(const char *key, const char *default_value)
         CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
         CFRelease(cfDefaultValue);
 
-        command = (char *) malloc(len * sizeof(char));
+        command = (char *)malloc(len * sizeof(char));
         if (!command)
             goto command_from_prefs_out;
         strcpy(command, default_value);
     }
     else {
-        int len = CFStringGetLength((CFStringRef) PlistRef) + 1;
-
-        command = (char *) malloc(len * sizeof(char));
+        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
+        command = (char *)malloc(len * sizeof(char));
         if (!command)
             goto command_from_prefs_out;
-        CFStringGetCString((CFStringRef) PlistRef, command, len,
+        CFStringGetCString((CFStringRef)PlistRef, command, len,
                            kCFStringEncodingASCII);
     }
 
- command_from_prefs_out:
+command_from_prefs_out:
     if (PlistRef)
         CFRelease(PlistRef);
     if (cfKey)
diff --git a/xorg-server/hw/xquartz/mach-startup/launchd_fd.c b/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
index fd1d276e3..15866cc42 100644
--- a/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
+++ b/xorg-server/hw/xquartz/mach-startup/launchd_fd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 Apple Inc.
+/* Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -45,30 +45,35 @@ launchd_display_fd(void)
     launch_data_t listening_fd_array, listening_fd;
 
     /* Get launchd fd */
-    if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) == NULL) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN
-                "\") Unable to create string.\n");
+    if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) ==
+        NULL) {
+        asl_log(
+            aslc, NULL, ASL_LEVEL_ERR,
+            "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN
+            "\") Unable to create string.\n");
         return ERROR_FD;
     }
 
     if ((checkin_response = launch_msg(checkin_request)) == NULL) {
         asl_log(aslc, NULL, ASL_LEVEL_WARNING,
                 "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",
-                strerror(errno));
+                strerror(
+                    errno));
         return ERROR_FD;
     }
 
     if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {
         // ignore EACCES, which is common if we weren't started by launchd
         if (launch_data_get_errno(checkin_response) != EACCES)
-            asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n",
-                    strerror(launch_data_get_errno(checkin_response)));
+            asl_log(aslc, NULL, ASL_LEVEL_ERR,
+                    "launchd check-in failed: %s\n",
+                    strerror(launch_data_get_errno(
+                                 checkin_response)));
         return ERROR_FD;
     }
 
-    sockets_dict =
-        launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
+    sockets_dict = launch_data_dict_lookup(checkin_response,
+                                           LAUNCH_JOBKEY_SOCKETS);
     if (NULL == sockets_dict) {
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
                 "launchd check-in: no sockets found to answer requests on!\n");
@@ -81,14 +86,15 @@ launchd_display_fd(void)
         return ERROR_FD;
     }
 
-    listening_fd_array =
-        launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX ":0");
+    listening_fd_array = launch_data_dict_lookup(sockets_dict,
+                                                 BUNDLE_ID_PREFIX ":0");
     if (NULL == listening_fd_array) {
         listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
         if (NULL == listening_fd_array) {
-            asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                    "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n",
-                    BUNDLE_ID_PREFIX);
+            asl_log(
+                aslc, NULL, ASL_LEVEL_ERR,
+                "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n",
+                BUNDLE_ID_PREFIX);
             return ERROR_FD;
         }
     }
@@ -96,7 +102,8 @@ launchd_display_fd(void)
     if (launch_data_array_get_count(listening_fd_array) != 1) {
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
                 "launchd check-in: Expected 1 socket from launchd, got %u)\n",
-                (unsigned) launch_data_array_get_count(listening_fd_array));
+                (unsigned)launch_data_array_get_count(
+                    listening_fd_array));
         return ERROR_FD;
     }
 
diff --git a/xorg-server/hw/xquartz/mach-startup/launchd_fd.h b/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
index 12caf7193..6af03a81d 100644
--- a/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
+++ b/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 Apple Inc.
+/* Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -31,6 +31,7 @@
 
 #define ERROR_FD -1
 
-int launchd_display_fd(void);
+int
+launchd_display_fd(void);
 
 #endif /* _XQUARTZ_LAUNCHD_FD_H_ */
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c
index f457aaba0..b5a3168ca 100644
--- a/xorg-server/hw/xquartz/mach-startup/stub.c
+++ b/xorg-server/hw/xquartz/mach-startup/stub.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 Apple Inc.
+/* Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -40,7 +40,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#define kX11AppBundleId BUNDLE_ID_PREFIX".X11"
+#define kX11AppBundleId   BUNDLE_ID_PREFIX ".X11"
 #define kX11AppBundlePath "/Contents/MacOS/X11"
 
 #include <mach/mach.h>
@@ -65,36 +65,43 @@ set_x11_path(void)
 
     CFURLRef appURL = NULL;
     OSStatus osstatus =
-        LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil,
-                                 nil, &appURL);
+        LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(
+                                     kX11AppBundleId), nil, nil, &appURL);
 
     switch (osstatus) {
     case noErr:
         if (appURL == NULL) {
-            asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                    "Xquartz: Invalid response from LSFindApplicationForInfo(%s)",
-                    kX11AppBundleId);
+            asl_log(
+                aslc, NULL, ASL_LEVEL_ERR,
+                "Xquartz: Invalid response from LSFindApplicationForInfo(%s)",
+                kX11AppBundleId);
             exit(1);
         }
 
-        if (!CFURLGetFileSystemRepresentation
-            (appURL, true, (unsigned char *) x11_path, sizeof(x11_path))) {
+        if (!CFURLGetFileSystemRepresentation(appURL, true,
+                                              (unsigned char *)x11_path,
+                                              sizeof(x11_path))) {
             asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                    "Xquartz: Error resolving URL for %s", kX11AppBundleId);
+                    "Xquartz: Error resolving URL for %s",
+                    kX11AppBundleId);
             exit(3);
         }
 
         strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
         asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
         break;
+
     case kLSApplicationNotFoundErr:
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                "Xquartz: Unable to find application for %s", kX11AppBundleId);
+                "Xquartz: Unable to find application for %s",
+                kX11AppBundleId);
         exit(10);
+
     default:
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
                 "Xquartz: Unable to find application for %s, error code = %d",
-                kX11AppBundleId, (int) osstatus);
+                kX11AppBundleId,
+                (int)osstatus);
         exit(11);
     }
 #else
@@ -117,23 +124,25 @@ connect_to_socket(const char *filename)
     servaddr_un.sun_family = AF_UNIX;
     strlcpy(servaddr_un.sun_path, filename, sizeof(servaddr_un.sun_path));
 
-    servaddr = (struct sockaddr *) &servaddr_un;
-    servaddr_len =
-        sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) +
-        strlen(filename);
+    servaddr = (struct sockaddr *)&servaddr_un;
+    servaddr_len = sizeof(struct sockaddr_un) -
+                   sizeof(servaddr_un.sun_path) + strlen(filename);
 
     ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
     if (ret_fd == -1) {
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
                 "Xquartz: Failed to create socket: %s - %s", filename,
-                strerror(errno));
+                strerror(
+                    errno));
         return -1;
     }
 
     if (connect(ret_fd, servaddr, servaddr_len) < 0) {
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                "Xquartz: Failed to connect to socket: %s - %d - %s", filename,
-                errno, strerror(errno));
+                "Xquartz: Failed to connect to socket: %s - %d - %s",
+                filename, errno,
+                strerror(
+                    errno));
         close(ret_fd);
         return -1;
     }
@@ -173,12 +182,13 @@ send_fd_handoff(int connected_fd, int launchd_fd)
 
     msg.msg_controllen = cmsg->cmsg_len;
 
-    *((int *) CMSG_DATA(cmsg)) = launchd_fd;
+    *((int *)CMSG_DATA(cmsg)) = launchd_fd;
 
     if (sendmsg(connected_fd, &msg, 0) < 0) {
-        asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                "Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s",
-                connected_fd, errno, strerror(errno));
+        asl_log(
+            aslc, NULL, ASL_LEVEL_ERR,
+            "Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s",
+            connected_fd, errno, strerror(errno));
         return;
     }
 
@@ -187,7 +197,7 @@ send_fd_handoff(int connected_fd, int launchd_fd)
     close(connected_fd);
 }
 
-__attribute__ ((__noreturn__))
+__attribute__((__noreturn__))
 static void
 signal_handler(int sig)
 {
@@ -256,18 +266,19 @@ main(int argc, char **argv, char **envp)
         child = fork();
         if (child == -1) {
             asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s",
-                    strerror(errno));
+                    strerror(
+                        errno));
             return EXIT_FAILURE;
         }
 
         if (child == 0) {
             char *_argv[3];
-
             _argv[0] = x11_path;
             _argv[1] = "--listenonly";
             _argv[2] = NULL;
             asl_log(aslc, NULL, ASL_LEVEL_NOTICE,
-                    "Xquartz: Starting X server: %s --listenonly", x11_path);
+                    "Xquartz: Starting X server: %s --listenonly",
+                    x11_path);
             return execvp(x11_path, _argv);
         }
 
@@ -282,10 +293,12 @@ main(int argc, char **argv, char **envp)
         if (kr != KERN_SUCCESS) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
             asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                    "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(kr));
+                    "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(
+                        kr));
 #else
             asl_log(aslc, NULL, ASL_LEVEL_ERR,
-                    "Xquartz: bootstrap_look_up(): %ul", (unsigned long) kr);
+                    "Xquartz: bootstrap_look_up(): %ul",
+                    (unsigned long)kr);
 #endif
             return EXIT_FAILURE;
         }
@@ -300,11 +313,13 @@ main(int argc, char **argv, char **envp)
         int handoff_fd = -1;
 
         for (try = 0, try_max = 5; try < try_max; try++) {
-            if (request_fd_handoff_socket(mp, handoff_socket_filename) !=
+            if (request_fd_handoff_socket(mp,
+                                          handoff_socket_filename) !=
                 KERN_SUCCESS) {
-                asl_log(aslc, NULL, ASL_LEVEL_INFO,
-                        "Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)",
-                        (int) try + 1, (int) try_max);
+                asl_log(
+                    aslc, NULL, ASL_LEVEL_INFO,
+                    "Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)",
+                    (int)try + 1, (int)try_max);
                 continue;
             }
 
@@ -312,14 +327,16 @@ main(int argc, char **argv, char **envp)
             if (handoff_fd == -1) {
                 asl_log(aslc, NULL, ASL_LEVEL_ERR,
                         "Xquartz: Failed to connect to socket (try %d of %d)",
-                        (int) try + 1, (int) try_max);
+                        (int)try + 1,
+                        (int)try_max);
                 continue;
             }
 
-            asl_log(aslc, NULL, ASL_LEVEL_INFO,
-                    "Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\".  Sending message.",
-                    (int) try + 1, (int) try_max, handoff_fd,
-                    handoff_socket_filename);
+            asl_log(
+                aslc, NULL, ASL_LEVEL_INFO,
+                "Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\".  Sending message.",
+                (int)try + 1, (int)try_max, handoff_fd,
+                handoff_socket_filename);
             send_fd_handoff(handoff_fd, launchd_fd);
             close(handoff_fd);
             break;
@@ -327,13 +344,13 @@ main(int argc, char **argv, char **envp)
     }
 
     /* Count envp */
-    for (envpc = 0; envp[envpc]; envpc++);
+    for (envpc = 0; envp[envpc]; envpc++) ;
 
     /* We have fixed-size string lengths due to limitations in IPC,
      * so we need to copy our argv and envp.
      */
-    newargv = (string_array_t) calloc((1 + argc), sizeof(string_t));
-    newenvp = (string_array_t) calloc((1 + envpc), sizeof(string_t));
+    newargv = (string_array_t)calloc((1 + argc), sizeof(string_t));
+    newenvp = (string_array_t)calloc((1 + envpc), sizeof(string_t));
 
     if (!newargv || !newenvp) {
         asl_log(aslc, NULL, ASL_LEVEL_ERR,
@@ -355,7 +372,8 @@ main(int argc, char **argv, char **envp)
 
     if (kr != KERN_SUCCESS) {
         asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s",
-                mach_error_string(kr));
+                mach_error_string(
+                    kr));
         return EXIT_FAILURE;
     }
     return EXIT_SUCCESS;
diff --git a/xorg-server/hw/xquartz/pbproxy/app-main.m b/xorg-server/hw/xquartz/pbproxy/app-main.m
index c061418d8..37b578223 100644
--- a/xorg-server/hw/xquartz/pbproxy/app-main.m
+++ b/xorg-server/hw/xquartz/pbproxy/app-main.m
@@ -1,37 +1,38 @@
 /* app-main.m
-   Copyright (c) 2002, 2008 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
  */
 
 #include "pbproxy.h"
 #import "x-selection.h"
 
 #include <pthread.h>
-#include <unistd.h>             /*for getpid */
+#include <unistd.h> /*for getpid*/
 #include <Cocoa/Cocoa.h>
 
 static const char *app_prefs_domain = BUNDLE_ID_PREFIX ".xpbproxy";
@@ -50,13 +51,14 @@ signal_handler(int sig)
     case SIGHUP:
         xpbproxy_prefs_reload = YES;
         break;
+
     default:
         _exit(EXIT_SUCCESS);
     }
 }
 
 void
-ErrorF(const char *f, ...)
+ErrorF(const char * f, ...)
 {
     va_list args;
 
@@ -68,7 +70,8 @@ ErrorF(const char *f, ...)
 /* TODO: Have this actually log to ASL */
 void
 xq_asl_log(int level, const char *subsystem, const char *file,
-           const char *function, int line, const char *fmt, ...)
+           const char *function, int line, const char *fmt,
+           ...)
 {
 #ifdef DEBUG
     va_list args;
@@ -99,11 +102,12 @@ main(int argc, const char *argv[])
             app_prefs_domain = argv[++i];
         }
         else if (strcmp(argv[i], "--help") == 0) {
-            ErrorF("usage: xpbproxy OPTIONS\n"
-                   "Pasteboard proxying for X11.\n\n"
-                   "--prefs-domain <domain>   Change the domain used for reading preferences\n"
-                   "                          (default: %s)\n",
-                   app_prefs_domain);
+            ErrorF(
+                "usage: xpbproxy OPTIONS\n"
+                "Pasteboard proxying for X11.\n\n"
+                "--prefs-domain <domain>   Change the domain used for reading preferences\n"
+                "                          (default: %s)\n",
+                app_prefs_domain);
             return 0;
         }
         else {
@@ -113,9 +117,8 @@ main(int argc, const char *argv[])
         }
     }
 
-    app_prefs_domain_cfstr =
-        CFStringCreateWithCString(NULL, app_prefs_domain,
-                                  kCFStringEncodingUTF8);
+    app_prefs_domain_cfstr = CFStringCreateWithCString(NULL, app_prefs_domain,
+                                                       kCFStringEncodingUTF8);
 
     signal(SIGINT, signal_handler);
     signal(SIGTERM, signal_handler);
diff --git a/xorg-server/hw/xquartz/pbproxy/main.m b/xorg-server/hw/xquartz/pbproxy/main.m
index b52aec8a4..abedb0839 100644
--- a/xorg-server/hw/xquartz/pbproxy/main.m
+++ b/xorg-server/hw/xquartz/pbproxy/main.m
@@ -1,30 +1,31 @@
 /* main.m
-   Copyright (c) 2002, 2008 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
  */
 
 #include "pbproxy.h"
@@ -64,7 +65,7 @@ wait_for_server_init(void)
 }
 
 static int
-x_io_error_handler(Display * dpy)
+x_io_error_handler(Display *dpy)
 {
     /* We lost our connection to the server. */
 
@@ -85,7 +86,7 @@ x_io_error_handler(Display * dpy)
 }
 
 static int
-x_error_handler(Display * dpy, XErrorEvent * errevent)
+x_error_handler(Display *dpy, XErrorEvent *errevent)
 {
     return 0;
 }
@@ -93,7 +94,7 @@ x_error_handler(Display * dpy, XErrorEvent * errevent)
 int
 xpbproxy_run(void)
 {
-    NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     size_t i;
 
     wait_for_server_init();
@@ -103,7 +104,6 @@ xpbproxy_run(void)
 
         if (!xpbproxy_dpy && display) {
             char _display[32];
-
             snprintf(_display, sizeof(_display), ":%s", display);
             setenv("DISPLAY", _display, TRUE);
 
@@ -136,7 +136,7 @@ xpbproxy_run(void)
     XAppleWMSelectInput(xpbproxy_dpy, AppleWMActivationNotifyMask |
                         AppleWMPasteboardNotifyMask);
 
-    _selection_object =[[x_selection alloc] init];
+    _selection_object = [[x_selection alloc] init];
 
     if (!xpbproxy_input_register()) {
         [pool release];
diff --git a/xorg-server/hw/xquartz/pbproxy/pbproxy.h b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
index bdb15aeca..c5a07f2d0 100644
--- a/xorg-server/hw/xquartz/pbproxy/pbproxy.h
+++ b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
@@ -1,31 +1,32 @@
 /* pbproxy.h
-   Copyright (c) 2002, 2008 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
-*/
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef PBPROXY_H
 #define PBPROXY_H 1
@@ -65,11 +66,16 @@ extern BOOL xpbproxy_is_standalone;
 #endif
 
 /* from main.m */
-extern void xpbproxy_set_is_active(BOOL state);
-extern BOOL xpbproxy_get_is_active(void);
-extern id xpbproxy_selection_object(void);
-extern Time xpbproxy_current_timestamp(void);
-extern int xpbproxy_run(void);
+extern void
+xpbproxy_set_is_active(BOOL state);
+extern BOOL
+xpbproxy_get_is_active(void);
+extern id
+xpbproxy_selection_object(void);
+extern Time
+xpbproxy_current_timestamp(void);
+extern int
+xpbproxy_run(void);
 
 extern Display *xpbproxy_dpy;
 extern int xpbproxy_apple_wm_event_base, xpbproxy_apple_wm_error_base;
@@ -77,21 +83,28 @@ extern int xpbproxy_xfixes_event_base, xpbproxy_xfixes_error_base;
 extern BOOL xpbproxy_have_xfixes;
 
 /* from x-input.m */
-extern BOOL xpbproxy_input_register(void);
+extern BOOL
+xpbproxy_input_register(void);
 
 /* os/log.c or app-main.m */
 extern void
-ErrorF(const char *f, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);
+ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2);
 
 /* from darwin.h */
 _X_ATTRIBUTE_PRINTF(6, 7)
 extern void
 xq_asl_log(int level, const char *subsystem, const char *file,
-           const char *function, int line, const char *fmt, ...);
-
-#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)
-#define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args)
-#define TRACE() DebugF("TRACE")
-
-#endif                          /* PBPROXY_H */
+           const char *function, int line, const char *fmt,
+           ...);
+
+#define ASL_LOG(level, subsystem, msg, args ...) xq_asl_log(level, subsystem, \
+                                                            __FILE__, \
+                                                            __FUNCTION__, \
+                                                            __LINE__, msg, \
+                                                            ## args)
+#define DebugF(msg, args ...)                    ASL_LOG(ASL_LEVEL_DEBUG, \
+                                                         "xpbproxy", msg, \
+                                                         ## args)
+#define TRACE()                                  DebugF("TRACE")
+
+#endif /* PBPROXY_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/x-input.m b/xorg-server/hw/xquartz/pbproxy/x-input.m
index 134bf59d8..71b46a8b3 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-input.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-input.m
@@ -1,30 +1,31 @@
 /* x-input.m -- event handling
-   Copyright (c) 2002, 2008 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
  */
 
 #include "pbproxy.h"
@@ -49,16 +50,17 @@ BOOL xpbproxy_prefs_reload = NO;
 static Time last_activation_time;
 
 static void
-x_event_apple_wm_notify(XAppleWMNotifyEvent * e)
+x_event_apple_wm_notify(XAppleWMNotifyEvent *e)
 {
     int type = e->type - xpbproxy_apple_wm_event_base;
     int kind = e->kind;
 
     /* We want to reload prefs even if we're not active */
-    if (type == AppleWMActivationNotify && kind == AppleWMReloadPreferences)
-        [xpbproxy_selection_object()reload_preferences];
+    if (type == AppleWMActivationNotify &&
+        kind == AppleWMReloadPreferences)
+        [xpbproxy_selection_object ()reload_preferences];
 
-    if (![xpbproxy_selection_object()is_active])
+    if (![xpbproxy_selection_object ()is_active])
         return;
 
     switch (type) {
@@ -66,11 +68,11 @@ x_event_apple_wm_notify(XAppleWMNotifyEvent * e)
         switch (kind) {
         case AppleWMIsActive:
             last_activation_time = e->time;
- [xpbproxy_selection_object()x_active:e->time];
+            [xpbproxy_selection_object () x_active:e->time];
             break;
 
         case AppleWMIsInactive:
- [xpbproxy_selection_object()x_inactive:e->time];
+            [xpbproxy_selection_object () x_inactive:e->time];
             break;
         }
         break;
@@ -78,7 +80,7 @@ x_event_apple_wm_notify(XAppleWMNotifyEvent * e)
     case AppleWMPasteboardNotify:
         switch (kind) {
         case AppleWMCopyToPasteboard:
- [xpbproxy_selection_object()x_copy:e->time];
+            [xpbproxy_selection_object () x_copy:e->time];
         }
         break;
     }
@@ -87,7 +89,7 @@ x_event_apple_wm_notify(XAppleWMNotifyEvent * e)
 static void
 xpbproxy_process_xevents(void)
 {
-    NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     if (pool == nil) {
         ErrorF("unable to allocate/init auto release pool!\n");
@@ -101,31 +103,32 @@ xpbproxy_process_xevents(void)
 
         switch (e.type) {
         case SelectionClear:
-            if ([xpbproxy_selection_object()is_active])
- [xpbproxy_selection_object()clear_event:&e.xselectionclear];
+            if ([xpbproxy_selection_object ()is_active])
+                [xpbproxy_selection_object () clear_event:&e.xselectionclear];
             break;
 
         case SelectionRequest:
- [xpbproxy_selection_object()request_event:&e.xselectionrequest];
+            [xpbproxy_selection_object () request_event:&e.xselectionrequest];
             break;
 
         case SelectionNotify:
- [xpbproxy_selection_object()notify_event:&e.xselection];
+            [xpbproxy_selection_object () notify_event:&e.xselection];
             break;
 
         case PropertyNotify:
- [xpbproxy_selection_object()property_event:&e.xproperty];
+            [xpbproxy_selection_object () property_event:&e.xproperty];
             break;
 
         default:
             if (e.type >= xpbproxy_apple_wm_event_base &&
-                e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {
-                x_event_apple_wm_notify((XAppleWMNotifyEvent *) & e);
+                e.type < xpbproxy_apple_wm_event_base +
+                AppleWMNumberEvents) {
+                x_event_apple_wm_notify((XAppleWMNotifyEvent *)&e);
             }
-            else if (e.type ==
-                     xpbproxy_xfixes_event_base + XFixesSelectionNotify) {
- [xpbproxy_selection_object()xfixes_selection_notify:(XFixesSelectionNotifyEvent *) &
-                 e];
+            else if (e.type == xpbproxy_xfixes_event_base +
+                     XFixesSelectionNotify) {
+                [xpbproxy_selection_object () xfixes_selection_notify:(
+                     XFixesSelectionNotifyEvent *)&e];
             }
             break;
         }
@@ -138,8 +141,8 @@ xpbproxy_process_xevents(void)
 
 static BOOL
 add_input_socket(int sock, CFOptionFlags callback_types,
-                 CFSocketCallBack callback, const CFSocketContext * ctx,
-                 CFRunLoopSourceRef * cf_source)
+                 CFSocketCallBack callback, const CFSocketContext *ctx,
+                 CFRunLoopSourceRef *cf_source)
 {
     CFSocketRef cf_sock;
 
@@ -150,7 +153,8 @@ add_input_socket(int sock, CFOptionFlags callback_types,
         return FALSE;
     }
 
-    *cf_source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, cf_sock, 0);
+    *cf_source = CFSocketCreateRunLoopSource(kCFAllocatorDefault,
+                                             cf_sock, 0);
     CFRelease(cf_sock);
 
     if (*cf_source == NULL)
@@ -168,7 +172,7 @@ x_input_callback(CFSocketRef sock, CFSocketCallBackType type,
 
 #ifdef STANDALONE_XPBPROXY
     if (xpbproxy_prefs_reload) {
-        [xpbproxy_selection_object()reload_preferences];
+        [xpbproxy_selection_object ()reload_preferences];
         xpbproxy_prefs_reload = NO;
     }
 #endif
@@ -179,7 +183,7 @@ x_input_callback(CFSocketRef sock, CFSocketCallBackType type,
 BOOL
 xpbproxy_input_register(void)
 {
-    return add_input_socket(ConnectionNumber(xpbproxy_dpy),
-                            kCFSocketReadCallBack, x_input_callback, NULL,
-                            &xpbproxy_dpy_source);
+    return add_input_socket(ConnectionNumber(
+                                xpbproxy_dpy), kCFSocketReadCallBack,
+                            x_input_callback, NULL, &xpbproxy_dpy_source);
 }
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.h b/xorg-server/hw/xquartz/pbproxy/x-selection.h
index f5c6c9bd5..38967dc45 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.h
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.h
@@ -1,32 +1,32 @@
 /* x-selection.h -- proxies between NSPasteboard and X11 selections
-
-   Copyright (c) 2002, 2008 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
-*/
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef X_SELECTION_H
 #define X_SELECTION_H 1
@@ -48,13 +48,15 @@ struct propdata {
 
 struct atom_list {
     Atom primary, clipboard, text, utf8_string, string, targets, multiple,
-        cstring, image_png, image_jpeg, incr, atom, clipboard_manager,
-        compound_text, atom_pair;
+         cstring, image_png, image_jpeg, incr, atom, clipboard_manager,
+         compound_text, atom_pair;
 };
 
- @interface x_selection:NSObject {
+@interface x_selection : NSObject
+{
     @private
-        /* The unmapped window we use for fetching selections. */
+
+    /* The unmapped window we use for fetching selections. */
     Window _selection_window;
 
     Atom request_atom;
@@ -65,15 +67,14 @@ struct atom_list {
         Atom selection;
     } pending;
 
-    /* 
+    /*
      * This is the number of times the user has requested a copy.
-     * Once the copy is completed, we --pending_copy, and if the 
+     * Once the copy is completed, we --pending_copy, and if the
      * pending_copy is > 0 we do it again.
      */
     int pending_copy;
-
-    /* 
-     * This is used for the same purpose as pending_copy, but for the 
+    /*
+     * This is used for the same purpose as pending_copy, but for the
      * CLIPBOARD.  It also prevents a race with INCR transfers.
      */
     int pending_clipboard;
@@ -81,30 +82,30 @@ struct atom_list {
     struct atom_list atoms[1];
 }
 
- -(void) x_active:(Time) timestamp;
- -(void) x_inactive:(Time) timestamp;
-
- -(void) x_copy:(Time) timestamp;
-
- -(void) clear_event:(XSelectionClearEvent *) e;
- -(void) request_event:(XSelectionRequestEvent *) e;
- -(void) notify_event:(XSelectionEvent *) e;
- -(void) property_event:(XPropertyEvent *) e;
- -(void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *) e;
- -(void) handle_selection:(Atom)
-selection type:(Atom)
-type propdata:(struct propdata *) pdata;
-
--(void) claim_clipboard;
- -(BOOL) set_clipboard_manager_status:(BOOL) value;
--(void) own_clipboard;
- -(void) copy_completed:(Atom) selection;
-
--(void) reload_preferences;
--(BOOL) is_active;
- -(void) send_none:(XSelectionRequestEvent *) e;
+- (void)x_active:(Time)timestamp;
+- (void)x_inactive:(Time)timestamp;
+
+- (void)x_copy:(Time)timestamp;
+
+- (void)clear_event:(XSelectionClearEvent *)e;
+- (void)request_event:(XSelectionRequestEvent *)e;
+- (void)notify_event:(XSelectionEvent *)e;
+- (void)property_event:(XPropertyEvent *)e;
+- (void)xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e;
+- (void)handle_selection:(Atom) selection type:(Atom) type propdata:(struct
+                                                                     propdata
+                                                                     *)pdata;
+- (void)claim_clipboard;
+- (BOOL)set_clipboard_manager_status:(BOOL)value;
+- (void)own_clipboard;
+- (void)copy_completed:(Atom)selection;
+
+- (void)reload_preferences;
+- (BOOL)is_active;
+- (void)send_none:(XSelectionRequestEvent *)e;
 @end
+
 /* main.m */
-extern x_selection *_selection_object;
+extern x_selection * _selection_object;
 
-#endif                          /* X_SELECTION_H */
+#endif /* X_SELECTION_H */
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.m b/xorg-server/hw/xquartz/pbproxy/x-selection.m
index 317aed073..13d5e13ad 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.m
@@ -1,32 +1,32 @@
 /* x-selection.m -- proxies between NSPasteboard and X11 selections
-
-   Copyright (c) 2002, 2008 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. 
-*/
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #import "x-selection.h"
 
@@ -46,9 +46,9 @@
  * case we take the PRIMARY selection, and set it as the NSPasteboard data.
  *
  * When an X11 client copies something to the CLIPBOARD, pbproxy greedily grabs
- * the data, sets it as the NSPasteboard data, and finally sets itself as 
+ * the data, sets it as the NSPasteboard data, and finally sets itself as
  * owner of the CLIPBOARD.
- * 
+ *
  * When an X11 window is activated we check to see if the NSPasteboard has
  * changed.  If the NSPasteboard has changed, then we set pbproxy as owner
  * of the PRIMARY and CLIPBOARD and respond to requests for text and images.
@@ -66,18 +66,20 @@
 
 static struct {
     BOOL active;
-    BOOL primary_on_grab;       /* This is provided as an option for people who
-                                 * want it and has issues that won't ever be
-                                 * addressed to make it *always* work.
-                                 */
+    BOOL primary_on_grab; /* This is provided as an option for people who
+                           * want it and has issues that won't ever be
+                           * addressed to make it *always* work.
+                           */
     BOOL clipboard_to_pasteboard;
     BOOL pasteboard_to_primary;
     BOOL pasteboard_to_clipboard;
-} pbproxy_prefs = {
-YES, NO, YES, YES, YES};
+} pbproxy_prefs = { YES, NO, YES, YES, YES };
 
 @implementation x_selection
-    static struct propdata null_propdata = { NULL, 0, 0 };
+
+static struct propdata null_propdata = {
+    NULL, 0, 0
+};
 
 #ifdef DEBUG
 static void
@@ -107,7 +109,7 @@ prefs_get_bool(CFStringRef key, BOOL defaultValue)
 
     value = CFPreferencesGetAppBooleanValue(key, app_prefs_domain_cfstr, &ok);
 
-    return ok ? (BOOL) value : defaultValue;
+    return ok ? (BOOL)value : defaultValue;
 }
 
 static void
@@ -124,8 +126,8 @@ free_propdata(struct propdata *pdata)
 }
 
 /*
- * Return True if an error occurs.  Return False if pdata has data 
- * and we finished. 
+ * Return True if an error occurs.  Return False if pdata has data
+ * and we finished.
  * The property is only deleted when bytesleft is 0 if delete is True.
  */
 static Bool
@@ -134,7 +136,6 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
 {
     long offset = 0;
     unsigned long numitems, bytesleft = 0;
-
 #ifdef TEST
     /* This is used to test the growth handling. */
     unsigned long length = 4UL;
@@ -201,7 +202,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
             XFree(chunk);
             buf = newbuf;
             buflen = newbuflen;
-            /* offset is a multiple of 32 bits */
+            /* offset is a multiple of 32 bits*/
             offset += chunkbytesize / 4;
         }
         else {
@@ -218,13 +219,14 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
     pdata->length = buflen;
     pdata->format = format;
 
-    return /*success */ False;
+    return /*success*/ False;
 }
 
 /* Implementation methods */
 
 /* This finds the preferred type from a TARGETS list.*/
- -(Atom) find_preferred:(struct propdata *) pdata {
+- (Atom) find_preferred:(struct propdata *)pdata
+{
     Atom a = None;
     size_t i, step;
     Bool png = False, jpeg = False, utf8 = False, string = False;
@@ -232,13 +234,13 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
     TRACE();
 
     if (pdata->format != 32) {
-        ErrorF
-            ("Atom list is expected to be formatted as an array of 32bit values.\n");
+        ErrorF(
+            "Atom list is expected to be formatted as an array of 32bit values.\n");
         return None;
     }
 
     for (i = 0, step = sizeof(long); i < pdata->length; i += step) {
-        a = (Atom) *(long *) (pdata->data + i);
+        a = (Atom) * (long *)(pdata->data + i);
 
         if (a == atoms->image_png) {
             png = True;
@@ -254,7 +256,6 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
         }
         else {
             char *type = XGetAtomName(xpbproxy_dpy, a);
-
             if (type) {
                 DebugF("Unhandled X11 mime type: %s", type);
                 XFree(type);
@@ -262,7 +263,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
         }
     }
 
-    /*We prefer PNG over strings, and UTF8 over a Latin-1 string. */
+    /*We prefer PNG over strings, and UTF8 over a Latin-1 string.*/
     if (png)
         return atoms->image_png;
 
@@ -275,12 +276,13 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
     if (string)
         return atoms->string;
 
-    /* This is evidently something we don't know how to handle. */
+    /* This is evidently something we don't know how to handle.*/
     return None;
 }
 
 /* Return True if this is an INCR-style transfer. */
- -(Bool) is_incr_type:(XSelectionEvent *) e {
+- (Bool) is_incr_type:(XSelectionEvent *)e
+{
     Atom seltype;
     int format;
     unsigned long numitems = 0UL, bytesleft = 0UL;
@@ -289,8 +291,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
     TRACE();
 
     if (Success != XGetWindowProperty(xpbproxy_dpy, e->requestor, e->property,
-                                      /*offset */ 0L, /*length */ 4UL,
-                                      /*Delete */ False,
+                                      /*offset*/ 0L, /*length*/ 4UL,
+                                      /*Delete*/ False,
                                       AnyPropertyType, &seltype, &format,
                                       &numitems, &bytesleft, &chunk)) {
         return False;
@@ -302,11 +304,12 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
     return (seltype == atoms->incr) ? True : False;
 }
 
-/* 
- * This should be called after a selection has been copied, 
- * or when the selection is unfinished before a transfer completes. 
+/*
+ * This should be called after a selection has been copied,
+ * or when the selection is unfinished before a transfer completes.
  */
--(void) release_pending {
+- (void) release_pending
+{
     TRACE();
 
     free_propdata(&pending.propdata);
@@ -316,8 +319,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
 
 /* Return True if an error occurs during an append.*/
 /* Return False if the append succeeds. */
- -(Bool) append_to_pending:(struct propdata *)
-pdata requestor:(Window) requestor
+- (Bool) append_to_pending:(struct propdata *)pdata requestor:(Window)
+   requestor
 {
     unsigned char *newdata;
     size_t newlength;
@@ -346,26 +349,28 @@ pdata requestor:(Window) requestor
 }
 
 /* Called when X11 becomes active (i.e. has key focus) */
- -(void) x_active:(Time) timestamp {
+- (void) x_active:(Time)timestamp
+{
     static NSInteger changeCount;
     NSInteger countNow;
     NSPasteboard *pb;
 
     TRACE();
 
-    pb =[NSPasteboard generalPasteboard];
+    pb = [NSPasteboard generalPasteboard];
 
     if (nil == pb)
         return;
 
-    countNow =[pb changeCount];
+    countNow = [pb changeCount];
 
     if (countNow != changeCount) {
         DebugF("changed pasteboard!\n");
         changeCount = countNow;
 
         if (pbproxy_prefs.pasteboard_to_primary) {
-            XSetSelectionOwner(xpbproxy_dpy, atoms->primary, _selection_window,
+            XSetSelectionOwner(xpbproxy_dpy, atoms->primary,
+                               _selection_window,
                                CurrentTime);
         }
 
@@ -375,8 +380,8 @@ pdata requestor:(Window) requestor
     }
 
 #if 0
-    /*gstaplin: we should perhaps investigate something like this branch above... */
- if ([_pasteboard availableTypeFromArray:_known_types] != nil) {
+    /*gstaplin: we should perhaps investigate something like this branch above...*/
+    if ([_pasteboard availableTypeFromArray: _known_types] != nil) {
         /* Pasteboard has data we should proxy; I think it makes
            sense to put it on both CLIPBOARD and PRIMARY */
 
@@ -389,12 +394,14 @@ pdata requestor:(Window) requestor
 }
 
 /* Called when X11 loses key focus */
- -(void) x_inactive:(Time) timestamp {
+- (void) x_inactive:(Time)timestamp
+{
     TRACE();
 }
 
 /* This requests the TARGETS list from the PRIMARY selection owner. */
--(void) x_copy_request_targets {
+- (void) x_copy_request_targets
+{
     TRACE();
 
     request_atom = atoms->targets;
@@ -404,7 +411,8 @@ pdata requestor:(Window) requestor
 
 /* Called when the Edit/Copy item on the main X11 menubar is selected
  * and no appkit window claims it. */
- -(void) x_copy:(Time) timestamp {
+- (void) x_copy:(Time)timestamp
+{
     Window w;
 
     TRACE();
@@ -429,7 +437,8 @@ pdata requestor:(Window) requestor
  * This prevents tools like xclipboard from causing havoc.
  * Returns TRUE on success
  */
- -(BOOL) set_clipboard_manager_status:(BOOL) value {
+- (BOOL) set_clipboard_manager_status:(BOOL)value
+{
     TRACE();
 
     Window owner = XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager);
@@ -439,14 +448,15 @@ pdata requestor:(Window) requestor
             return TRUE;
 
         if (owner != None) {
-            ErrorF
-                ("A clipboard manager using window 0x%lx already owns the clipboard selection.  "
-                 "pbproxy will not sync clipboard to pasteboard.\n", owner);
+            ErrorF(
+                "A clipboard manager using window 0x%lx already owns the clipboard selection.  "
+                "pbproxy will not sync clipboard to pasteboard.\n", owner);
             return FALSE;
         }
 
         XSetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager,
-                           _selection_window, CurrentTime);
+                           _selection_window,
+                           CurrentTime);
         return (_selection_window ==
                 XGetSelectionOwner(xpbproxy_dpy, atoms->clipboard_manager));
     }
@@ -464,17 +474,18 @@ pdata requestor:(Window) requestor
 }
 
 /*
- * This occurs when we previously owned a selection, 
+ * This occurs when we previously owned a selection,
  * and then lost it from another client.
  */
- -(void) clear_event:(XSelectionClearEvent *) e {
+- (void) clear_event:(XSelectionClearEvent *)e
+{
 
     TRACE();
 
     DebugF("e->selection %s\n", XGetAtomName(xpbproxy_dpy, e->selection));
 
     if (e->selection == atoms->clipboard) {
-        /* 
+        /*
          * We lost ownership of the CLIPBOARD.
          */
         ++pending_clipboard;
@@ -496,10 +507,11 @@ pdata requestor:(Window) requestor
     }
 }
 
-/* 
+/*
  * We greedily acquire the clipboard after it changes, and on startup.
  */
--(void) claim_clipboard {
+- (void) claim_clipboard
+{
     Window owner;
 
     TRACE();
@@ -514,11 +526,11 @@ pdata requestor:(Window) requestor
          * Set pbproxy's _selection_window as the owner, and continue.
          */
         DebugF("No clipboard owner.\n");
- [self copy_completed:atoms->clipboard];
+        [self copy_completed:atoms->clipboard];
         return;
     }
     else if (owner == _selection_window) {
- [self copy_completed:atoms->clipboard];
+        [self copy_completed:atoms->clipboard];
         return;
     }
 
@@ -532,7 +544,8 @@ pdata requestor:(Window) requestor
 }
 
 /* Greedily acquire the clipboard. */
--(void) own_clipboard {
+- (void) own_clipboard
+{
 
     TRACE();
 
@@ -544,8 +557,7 @@ pdata requestor:(Window) requestor
                                                      atoms->clipboard));
 }
 
- -(void) init_reply:(XEvent *)
-reply request:(XSelectionRequestEvent *) e
+- (void) init_reply:(XEvent *)reply request:(XSelectionRequestEvent *)e
 {
     reply->xselection.type = SelectionNotify;
     reply->xselection.selection = e->selection;
@@ -555,7 +567,8 @@ reply request:(XSelectionRequestEvent *) e
     reply->xselection.property = None;
 }
 
- -(void) send_reply:(XEvent *) reply {
+- (void) send_reply:(XEvent *)reply
+{
     /*
      * We are supposed to use an empty event mask, and not propagate
      * the event, according to the ICCCM.
@@ -566,35 +579,35 @@ reply request:(XSelectionRequestEvent *) e
     XFlush(xpbproxy_dpy);
 }
 
-/* 
+/*
  * This responds to a TARGETS request.
  * The result is a list of a ATOMs that correspond to the types available
- * for a selection.  
+ * for a selection.
  * For instance an application might provide a UTF8_STRING and a STRING
  * (in Latin-1 encoding).  The requestor can then make the choice based on
  * the list.
  */
- -(void) send_targets:(XSelectionRequestEvent *)
-e pasteboard:(NSPasteboard *) pb
+- (void) send_targets:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)
+   pb
 {
     XEvent reply;
     NSArray *pbtypes;
 
- [self init_reply: &reply request:e];
+    [self init_reply:&reply request:e];
 
-    pbtypes =[pb types];
+    pbtypes = [pb types];
     if (pbtypes) {
-        long list[7];           /* Don't forget to increase this if we handle more types! */
+        long list[7]; /* Don't forget to increase this if we handle more types! */
         long count = 0;
 
         /*
-         * I'm not sure if this is needed, but some toolkits/clients list 
-         * TARGETS in response to targets. 
+         * I'm not sure if this is needed, but some toolkits/clients list
+         * TARGETS in response to targets.
          */
         list[count] = atoms->targets;
         ++count;
 
- if ([pbtypes containsObject:NSStringPboardType]) {
+        if ([pbtypes containsObject:NSStringPboardType]) {
             /* We have a string type that we can convert to UTF8, or Latin-1... */
             DebugF("NSStringPboardType\n");
             list[count] = atoms->utf8_string;
@@ -610,11 +623,11 @@ e pasteboard:(NSPasteboard *) pb
          */
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // NSPICTPboardType
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType
 #endif
 
- if ([pbtypes containsObject:NSPICTPboardType]
- ||[pbtypes containsObject:NSTIFFPboardType]) {
+        if ([pbtypes containsObject:NSPICTPboardType]
+            || [pbtypes containsObject:NSTIFFPboardType]) {
             /* We can convert a TIFF to a PNG or JPEG. */
             DebugF("NSTIFFPboardType\n");
             list[count] = atoms->image_png;
@@ -630,19 +643,19 @@ e pasteboard:(NSPasteboard *) pb
         if (count) {
             /* We have a list of ATOMs to send. */
             XChangeProperty(xpbproxy_dpy, e->requestor, e->property,
-                            atoms->atom, 32, PropModeReplace,
-                            (unsigned char *) list, count);
+                            atoms->atom, 32,
+                            PropModeReplace, (unsigned char *)list,
+                            count);
 
             reply.xselection.property = e->property;
         }
     }
 
- [self send_reply:&reply];
+    [self send_reply:&reply];
 }
 
- -(void) send_string:(XSelectionRequestEvent *)
-e utf8:(BOOL)
-utf8 pasteboard:(NSPasteboard *) pb
+- (void) send_string:(XSelectionRequestEvent *)e utf8:(BOOL)utf8 pasteboard:(
+       NSPasteboard *)pb
 {
     XEvent reply;
     NSArray *pbtypes;
@@ -652,12 +665,12 @@ utf8 pasteboard:(NSPasteboard *) pb
 
     TRACE();
 
- [self init_reply: &reply request:e];
+    [self init_reply:&reply request:e];
 
-    pbtypes =[pb types];
+    pbtypes = [pb types];
 
- if (![pbtypes containsObject:NSStringPboardType]) {
- [self send_reply:&reply];
+    if (![pbtypes containsObject:NSStringPboardType]) {
+        [self send_reply:&reply];
         return;
     }
 
@@ -669,17 +682,17 @@ utf8 pasteboard:(NSPasteboard *) pb
            [pbtypes retainCount]);
 #endif
 
- data =[pb stringForType:NSStringPboardType];
+    data = [pb stringForType:NSStringPboardType];
 
     if (nil == data) {
- [self send_reply:&reply];
+        [self send_reply:&reply];
         return;
     }
 
     if (utf8) {
-        bytes =[data UTF8String];
+        bytes = [data UTF8String];
         /*
-         * We don't want the UTF-8 string length here.  
+         * We don't want the UTF-8 string length here.
          * We want the length in bytes.
          */
         length = strlen(bytes);
@@ -695,39 +708,38 @@ utf8 pasteboard:(NSPasteboard *) pb
     }
     else {
         DebugF("Latin-1\n");
- bytes =[data cStringUsingEncoding:NSISOLatin1StringEncoding];
+        bytes = [data cStringUsingEncoding:NSISOLatin1StringEncoding];
         /*WARNING: bytes is not NUL-terminated. */
- length =[data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
+        length = [data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
     }
 
     DebugF("e->target %s\n", XGetAtomName(xpbproxy_dpy, e->target));
 
     XChangeProperty(xpbproxy_dpy, e->requestor, e->property, e->target,
-                    8, PropModeReplace, (unsigned char *) bytes, length);
+                    8, PropModeReplace, (unsigned char *)bytes, length);
 
     reply.xselection.property = e->property;
 
- [self send_reply:&reply];
+    [self send_reply:&reply];
 }
 
- -(void) send_compound_text:(XSelectionRequestEvent *)
-e pasteboard:(NSPasteboard *) pb
+- (void) send_compound_text:(XSelectionRequestEvent *)e pasteboard:(
+       NSPasteboard *)pb
 {
     XEvent reply;
     NSArray *pbtypes;
 
     TRACE();
 
- [self init_reply: &reply request:e];
-
-    pbtypes =[pb types];
+    [self init_reply:&reply request:e];
 
- if ([pbtypes containsObject:NSStringPboardType]) {
- NSString *data =[pb stringForType:NSStringPboardType];
+    pbtypes = [pb types];
 
+    if ([pbtypes containsObject: NSStringPboardType]) {
+        NSString *data = [pb stringForType:NSStringPboardType];
         if (nil != data) {
             /*
-             * Cast to (void *) to avoid a const warning. 
+             * Cast to (void *) to avoid a const warning.
              * AFAIK Xutf8TextListToTextProperty does not modify the input memory.
              */
             void *utf8 = (void *)[data UTF8String];
@@ -741,9 +753,9 @@ e pasteboard:(NSPasteboard *) pb
                                                        &textprop)) {
 
                 if (8 != textprop.format)
-                    DebugF
-                        ("textprop.format is unexpectedly not 8 - it's %d instead\n",
-                         textprop.format);
+                    DebugF(
+                        "textprop.format is unexpectedly not 8 - it's %d instead\n",
+                        textprop.format);
 
                 XChangeProperty(xpbproxy_dpy, e->requestor, e->property,
                                 atoms->compound_text, textprop.format,
@@ -759,42 +771,41 @@ e pasteboard:(NSPasteboard *) pb
         }
     }
 
- [self send_reply:&reply];
+    [self send_reply:&reply];
 }
 
 /* Finding a test application that uses MULTIPLE has proven to be difficult. */
- -(void) send_multiple:(XSelectionRequestEvent *) e {
+- (void) send_multiple:(XSelectionRequestEvent *)e
+{
     XEvent reply;
 
     TRACE();
 
- [self init_reply: &reply request:e];
+    [self init_reply:&reply request:e];
 
-    if (None != e->property) {
+    if (None != e->property) {}
 
-    }
-
- [self send_reply:&reply];
+    [self send_reply:&reply];
 }
 
 /* Return nil if an error occured. */
-/* DO NOT retain the encdata for longer than the length of an event response.  
+/* DO NOT retain the encdata for longer than the length of an event response.
  * The autorelease pool will reuse/free it.
  */
- -(NSData *) encode_image_data:(NSData *)
-data type:(NSBitmapImageFileType) enctype
+- (NSData *) encode_image_data:(NSData *)data type:(NSBitmapImageFileType)
+   enctype
 {
     NSBitmapImageRep *bmimage = nil;
     NSData *encdata = nil;
     NSDictionary *dict = nil;
 
- bmimage =[[NSBitmapImageRep alloc] initWithData:data];
+    bmimage = [[NSBitmapImageRep alloc] initWithData:data];
 
     if (nil == bmimage)
         return nil;
 
-    dict =[[NSDictionary alloc] init];
- encdata =[bmimage representationUsingType: enctype properties:dict];
+    dict = [[NSDictionary alloc] init];
+    encdata = [bmimage representationUsingType:enctype properties:dict];
 
     if (nil == encdata) {
         [dict autorelease];
@@ -810,7 +821,9 @@ data type:(NSBitmapImageFileType) enctype
 
 /* Return YES when an error has occured when trying to send the PICT. */
 /* The caller should send a default reponse with a property of None when an error occurs. */
- -(BOOL) send_image_pict_reply: (XSelectionRequestEvent *) e pasteboard: (NSPasteboard *) pb type:(NSBitmapImageFileType) imagetype
+- (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e
+                    pasteboard:(NSPasteboard *)pb
+                          type:(NSBitmapImageFileType)imagetype
 {
     XEvent reply;
     NSImage *img = nil;
@@ -818,13 +831,13 @@ data type:(NSBitmapImageFileType) enctype
     NSUInteger length;
     const void *bytes = NULL;
 
- img =[[NSImage alloc] initWithPasteboard:pb];
+    img = [[NSImage alloc] initWithPasteboard:pb];
 
     if (nil == img) {
         return YES;
     }
 
-    data =[img TIFFRepresentation];
+    data = [img TIFFRepresentation];
 
     if (nil == data) {
         [img autorelease];
@@ -832,31 +845,33 @@ data type:(NSBitmapImageFileType) enctype
         return YES;
     }
 
- encdata =[self encode_image_data: data type:imagetype];
+    encdata = [self encode_image_data:data type:imagetype];
     if (nil == encdata) {
         [img autorelease];
         return YES;
     }
 
- [self init_reply: &reply request:e];
+    [self init_reply:&reply request:e];
 
-    length =[encdata length];
-    bytes =[encdata bytes];
+    length = [encdata length];
+    bytes = [encdata bytes];
 
     XChangeProperty(xpbproxy_dpy, e->requestor, e->property, e->target,
                     8, PropModeReplace, bytes, length);
     reply.xselection.property = e->property;
 
- [self send_reply:&reply];
+    [self send_reply:&reply];
 
     [img autorelease];
 
-    return NO;                  /*no error */
+    return NO; /*no error*/
 }
 
 /* Return YES if an error occured. */
 /* The caller should send a reply with a property of None when an error occurs. */
- -(BOOL) send_image_tiff_reply: (XSelectionRequestEvent *) e pasteboard: (NSPasteboard *) pb type:(NSBitmapImageFileType) imagetype
+- (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
+                    pasteboard:(NSPasteboard *)pb
+                          type:(NSBitmapImageFileType)imagetype
 {
     XEvent reply;
     NSData *data = nil;
@@ -864,32 +879,31 @@ data type:(NSBitmapImageFileType) enctype
     NSUInteger length;
     const void *bytes = NULL;
 
- data =[pb dataForType:NSTIFFPboardType];
+    data = [pb dataForType:NSTIFFPboardType];
 
     if (nil == data)
         return YES;
 
- encdata =[self encode_image_data: data type:imagetype];
+    encdata = [self encode_image_data:data type:imagetype];
 
     if (nil == encdata)
         return YES;
 
- [self init_reply: &reply request:e];
+    [self init_reply:&reply request:e];
 
-    length =[encdata length];
-    bytes =[encdata bytes];
+    length = [encdata length];
+    bytes = [encdata bytes];
 
     XChangeProperty(xpbproxy_dpy, e->requestor, e->property, e->target,
                     8, PropModeReplace, bytes, length);
     reply.xselection.property = e->property;
 
- [self send_reply:&reply];
+    [self send_reply:&reply];
 
-    return NO;                  /*no error */
+    return NO; /*no error*/
 }
 
- -(void) send_image:(XSelectionRequestEvent *)
-e pasteboard:(NSPasteboard *) pb
+- (void) send_image:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb
 {
     NSArray *pbtypes = nil;
     NSBitmapImageFileType imagetype = NSPNGFileType;
@@ -901,52 +915,56 @@ e pasteboard:(NSPasteboard *) pb
     else if (e->target == atoms->image_jpeg)
         imagetype = NSJPEGFileType;
     else {
-        ErrorF
-            ("internal failure in xpbproxy!  imagetype being sent isn't PNG or JPEG.\n");
+        ErrorF(
+            "internal failure in xpbproxy!  imagetype being sent isn't PNG or JPEG.\n");
     }
 
-    pbtypes =[pb types];
+    pbtypes = [pb types];
 
     if (pbtypes) {
- if ([pbtypes containsObject:NSTIFFPboardType]) {
- if (NO ==[self send_image_tiff_reply: e pasteboard: pb type:imagetype])
+        if ([pbtypes containsObject:NSTIFFPboardType]) {
+            if (NO ==
+                [self send_image_tiff_reply:e pasteboard:pb type:imagetype])
                 return;
         }
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // NSPICTPboardType
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // NSPICTPboardType
 #endif
- else if ([pbtypes containsObject:NSPICTPboardType])
+        else if ([pbtypes containsObject:NSPICTPboardType])
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
         {
- if (NO ==[self send_image_pict_reply: e pasteboard: pb type:imagetype])
+            if (NO ==
+                [self send_image_pict_reply:e pasteboard:pb type:imagetype])
                 return;
 
             /* Fall through intentionally to the send_none: */
         }
     }
 
- [self send_none:e];
+    [self send_none:e];
 }
 
- -(void) send_none:(XSelectionRequestEvent *) e {
+- (void)send_none:(XSelectionRequestEvent *)e
+{
     XEvent reply;
 
     TRACE();
 
- [self init_reply: &reply request:e];
- [self send_reply:&reply];
+    [self init_reply:&reply request:e];
+    [self send_reply:&reply];
 }
 
 /* Another client requested the data or targets of data available from the clipboard. */
- -(void) request_event:(XSelectionRequestEvent *) e {
+- (void)request_event:(XSelectionRequestEvent *)e
+{
     NSPasteboard *pb;
 
     TRACE();
 
-    /* TODO We should also keep track of the time of the selection, and 
+    /* TODO We should also keep track of the time of the selection, and
      * according to the ICCCM "refuse the request" if the event timestamp
      * is before we owned it.
      * What should we base the time on?  How can we get the current time just
@@ -956,12 +974,12 @@ e pasteboard:(NSPasteboard *) pb
      * Perhaps we should just punt and ignore races.
      */
 
-    /*TODO we need a COMPOUND_TEXT test app */
-    /*TODO we need a MULTIPLE test app */
+    /*TODO we need a COMPOUND_TEXT test app*/
+    /*TODO we need a MULTIPLE test app*/
 
-    pb =[NSPasteboard generalPasteboard];
+    pb = [NSPasteboard generalPasteboard];
     if (nil == pb) {
- [self send_none:e];
+        [self send_none:e];
         return;
     }
 
@@ -970,37 +988,39 @@ e pasteboard:(NSPasteboard *) pb
 
     if (e->target == atoms->targets) {
         /* The paste requestor wants to know what TARGETS we support. */
- [self send_targets: e pasteboard:pb];
+        [self send_targets:e pasteboard:pb];
     }
     else if (e->target == atoms->multiple) {
         /*
-         * This isn't finished, and may never be, unless I can find 
+         * This isn't finished, and may never be, unless I can find
          * a good test app.
          */
- [self send_multiple:e];
+        [self send_multiple:e];
     }
     else if (e->target == atoms->utf8_string) {
- [self send_string: e utf8: YES pasteboard:pb];
+        [self send_string:e utf8:YES pasteboard:pb];
     }
     else if (e->target == atoms->string) {
- [self send_string: e utf8: NO pasteboard:pb];
+        [self send_string:e utf8:NO pasteboard:pb];
     }
     else if (e->target == atoms->compound_text) {
- [self send_compound_text: e pasteboard:pb];
+        [self send_compound_text:e pasteboard:pb];
     }
     else if (e->target == atoms->multiple) {
- [self send_multiple:e];
+        [self send_multiple:e];
     }
-    else if (e->target == atoms->image_png || e->target == atoms->image_jpeg) {
- [self send_image: e pasteboard:pb];
+    else if (e->target == atoms->image_png || e->target ==
+             atoms->image_jpeg) {
+        [self send_image:e pasteboard:pb];
     }
     else {
- [self send_none:e];
+        [self send_none:e];
     }
 }
 
 /* This handles the events resulting from an XConvertSelection request. */
- -(void) notify_event:(XSelectionEvent *) e {
+- (void) notify_event:(XSelectionEvent *)e
+{
     Atom type;
     struct propdata pdata;
 
@@ -1010,7 +1030,7 @@ e pasteboard:(NSPasteboard *) pb
 
     if (None == e->property) {
         DebugF("e->property is None.\n");
- [self copy_completed:e->selection];
+        [self copy_completed:e->selection];
         /* Nothing is selected. */
         return;
     }
@@ -1020,20 +1040,20 @@ e pasteboard:(NSPasteboard *) pb
     ErrorF("e->property %s\n", XGetAtomName(xpbproxy_dpy, e->property));
 #endif
 
- if ([self is_incr_type:e]) {
+    if ([self is_incr_type:e]) {
         /*
-         * This is an INCR-style transfer, which means that we 
+         * This is an INCR-style transfer, which means that we
          * will get the data after a series of PropertyNotify events.
          */
         DebugF("is INCR\n");
 
-        if (get_property
-            (e->requestor, e->property, &pdata, /*Delete */ True, &type)) {
-            /* 
+        if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True,
+                         &type)) {
+            /*
              * An error occured, so we should invoke the copy_completed:, but
              * not handle_selection:type:propdata:
              */
- [self copy_completed:e->selection];
+            [self copy_completed:e->selection];
             return;
         }
 
@@ -1045,14 +1065,14 @@ e pasteboard:(NSPasteboard *) pb
         DebugF("set pending.requestor to 0x%lx\n", pending.requestor);
     }
     else {
-        if (get_property
-            (e->requestor, e->property, &pdata, /*Delete */ True, &type)) {
- [self copy_completed:e->selection];
+        if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True,
+                         &type)) {
+            [self copy_completed:e->selection];
             return;
         }
 
-        /* We have the complete selection data. */
- [self handle_selection: e->selection type: type propdata:&pdata];
+        /* We have the complete selection data.*/
+        [self handle_selection:e->selection type:type propdata:&pdata];
 
         DebugF("handled selection with the first notify_event\n");
     }
@@ -1060,7 +1080,8 @@ e pasteboard:(NSPasteboard *) pb
 
 /* This is used for INCR transfers.  See the ICCCM for the details. */
 /* This is used to retrieve PRIMARY and CLIPBOARD selections. */
- -(void) property_event:(XPropertyEvent *) e {
+- (void) property_event:(XPropertyEvent *)e
+{
     struct propdata pdata;
     Atom type;
 
@@ -1080,8 +1101,9 @@ e pasteboard:(NSPasteboard *) pb
     if (None != pending.requestor && PropertyNewValue == e->state) {
         DebugF("pending.requestor 0x%lx\n", pending.requestor);
 
-        if (get_property(e->window, e->atom, &pdata, /*Delete */ True, &type)) {
- [self copy_completed:pending.selection];
+        if (get_property(e->window, e->atom, &pdata, /*Delete*/ True,
+                         &type)) {
+            [self copy_completed:pending.selection];
             [self release_pending];
             return;
         }
@@ -1091,28 +1113,29 @@ e pasteboard:(NSPasteboard *) pb
              * We completed the transfer.
              * handle_selection will call copy_completed: for us.
              */
- [self handle_selection: pending.selection type: type propdata:&pending.
-             propdata];
+            [self handle_selection:pending.selection type:type propdata:&
+             pending.propdata];
             free_propdata(&pdata);
             pending.propdata = null_propdata;
             pending.requestor = None;
             pending.selection = None;
         }
         else {
- [self append_to_pending: &pdata requestor:e->window];
+            [self append_to_pending:&pdata requestor:e->window];
             free_propdata(&pdata);
         }
     }
 }
 
- -(void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *) e {
+- (void) xfixes_selection_notify:(XFixesSelectionNotifyEvent *)e
+{
     if (!pbproxy_prefs.active)
         return;
 
     switch (e->subtype) {
     case XFixesSetSelectionOwnerNotify:
         if (e->selection == atoms->primary && pbproxy_prefs.primary_on_grab)
- [self x_copy:e->timestamp];
+            [self x_copy:e->timestamp];
         break;
 
     case XFixesSelectionWindowDestroyNotify:
@@ -1124,8 +1147,7 @@ e pasteboard:(NSPasteboard *) pb
     }
 }
 
- -(void) handle_targets:(Atom)
-selection propdata:(struct propdata *) pdata
+- (void) handle_targets: (Atom)selection propdata:(struct propdata *)pdata
 {
     /* Find a type we can handle and prefer from the list of ATOMs. */
     Atom preferred;
@@ -1133,17 +1155,17 @@ selection propdata:(struct propdata *) pdata
 
     TRACE();
 
- preferred =[self find_preferred:pdata];
+    preferred = [self find_preferred:pdata];
 
     if (None == preferred) {
-        /* 
-         * This isn't required by the ICCCM, but some apps apparently 
+        /*
+         * This isn't required by the ICCCM, but some apps apparently
          * don't respond to TARGETS properly.
          */
         preferred = atoms->string;
     }
 
-    (void) name;                /* Avoid a warning with non-debug compiles. */
+    (void)name; /* Avoid a warning with non-debug compiles. */
 #ifdef DEBUG
     name = XGetAtomName(xpbproxy_dpy, preferred);
 
@@ -1158,8 +1180,7 @@ selection propdata:(struct propdata *) pdata
 
 /* This handles the image type of selection (typically in CLIPBOARD). */
 /* We convert to a TIFF, so that other applications can paste more easily. */
- -(void) handle_image:(struct propdata *)
-pdata pasteboard:(NSPasteboard *) pb
+- (void) handle_image: (struct propdata *)pdata pasteboard:(NSPasteboard *)pb
 {
     NSArray *pbtypes;
     NSUInteger length;
@@ -1169,7 +1190,7 @@ pdata pasteboard:(NSPasteboard *) pb
     TRACE();
 
     length = pdata->length;
- data =[[NSData alloc] initWithBytes: pdata->data length:length];
+    data = [[NSData alloc] initWithBytes:pdata->data length:length];
 
     if (nil == data) {
         DebugF("unable to create NSData object!\n");
@@ -1184,7 +1205,7 @@ pdata pasteboard:(NSPasteboard *) pb
            [data retainCount]);
 #endif
 
- bmimage =[[NSBitmapImageRep alloc] initWithData:data];
+    bmimage = [[NSBitmapImageRep alloc] initWithData:data];
 
     if (nil == bmimage) {
         [data autorelease];
@@ -1200,11 +1221,13 @@ pdata pasteboard:(NSPasteboard *) pb
            [data retainCount]);
 #endif
 
-    @try {
-        tiff =[bmimage TIFFRepresentation];
+    @try
+    {
+        tiff = [bmimage TIFFRepresentation];
     }
 
-    @catch(NSException * e) {
+    @catch (NSException *e)
+    {
         DebugF("NSTIFFException!\n");
         [data autorelease];
         [bmimage autorelease];
@@ -1219,7 +1242,7 @@ pdata pasteboard:(NSPasteboard *) pb
            [bmimage retainCount]);
 #endif
 
- pbtypes =[NSArray arrayWithObjects:NSTIFFPboardType, nil];
+    pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil];
 
     if (nil == pbtypes) {
         [data autorelease];
@@ -1227,46 +1250,49 @@ pdata pasteboard:(NSPasteboard *) pb
         return;
     }
 
- [pb declareTypes: pbtypes owner:nil];
- if (YES !=[pb setData: tiff forType:NSTIFFPboardType]) {
+    [pb declareTypes:pbtypes owner:nil];
+    if (YES != [pb setData:tiff forType:NSTIFFPboardType]) {
         DebugF("writing pasteboard data failed!\n");
     }
 
     [data autorelease];
 
 #ifdef __LP64__
-    DebugF("bmimage retainCount before release %lu\n",[bmimage retainCount]);
+    DebugF("bmimage retainCount before release %lu\n", [bmimage retainCount]);
 #else
-    DebugF("bmimage retainCount before release %u\n",[bmimage retainCount]);
+    DebugF("bmimage retainCount before release %u\n", [bmimage retainCount]);
 #endif
 
     [bmimage autorelease];
 }
 
 /* This handles the UTF8_STRING type of selection. */
- -(void) handle_utf8_string:(struct propdata *)
-pdata pasteboard:(NSPasteboard *) pb
+- (void) handle_utf8_string:(struct propdata *)pdata pasteboard:(NSPasteboard
+                                                                 *)pb
 {
     NSString *string;
     NSArray *pbtypes;
 
     TRACE();
 
- string =[[NSString alloc] initWithBytes: pdata->data length: pdata->length encoding:NSUTF8StringEncoding];
+    string =
+        [[NSString alloc] initWithBytes:pdata->data length:pdata->length
+         encoding:
+         NSUTF8StringEncoding];
 
     if (nil == string)
         return;
 
- pbtypes =[NSArray arrayWithObjects:NSStringPboardType, nil];
+    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
 
     if (nil == pbtypes) {
         [string autorelease];
         return;
     }
 
- [pb declareTypes: pbtypes owner:nil];
+    [pb declareTypes:pbtypes owner:nil];
 
- if (YES !=[pb setString: string forType:NSStringPboardType]) {
+    if (YES != [pb setString:string forType:NSStringPboardType]) {
         ErrorF("pasteboard setString:forType: failed!\n");
     }
     [string autorelease];
@@ -1274,28 +1300,31 @@ pdata pasteboard:(NSPasteboard *) pb
 }
 
 /* This handles the STRING type, which should be in Latin-1. */
- -(void) handle_string:(struct propdata *)
-pdata pasteboard:(NSPasteboard *) pb
+- (void) handle_string: (struct propdata *)pdata pasteboard:(NSPasteboard *)
+   pb
 {
     NSString *string;
     NSArray *pbtypes;
 
     TRACE();
 
- string =[[NSString alloc] initWithBytes: pdata->data length: pdata->length encoding:NSISOLatin1StringEncoding];
+    string =
+        [[NSString alloc] initWithBytes:pdata->data length:pdata->length
+         encoding:
+         NSISOLatin1StringEncoding];
 
     if (nil == string)
         return;
 
- pbtypes =[NSArray arrayWithObjects:NSStringPboardType, nil];
+    pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
 
     if (nil == pbtypes) {
         [string autorelease];
         return;
     }
 
- [pb declareTypes: pbtypes owner:nil];
- if (YES !=[pb setString: string forType:NSStringPboardType]) {
+    [pb declareTypes:pbtypes owner:nil];
+    if (YES != [pb setString:string forType:NSStringPboardType]) {
         ErrorF("pasteboard setString:forType failed in handle_string!\n");
     }
     [string autorelease];
@@ -1303,55 +1332,56 @@ pdata pasteboard:(NSPasteboard *) pb
 
 /* This is called when the selection is completely retrieved from another client. */
 /* Warning: this frees the propdata. */
- -(void) handle_selection:(Atom)
-selection type:(Atom)
-type propdata:(struct propdata *) pdata
+- (void) handle_selection:(Atom)selection type:(Atom)type propdata:(struct
+                                                                    propdata
+                                                                    *)pdata
 {
     NSPasteboard *pb;
 
     TRACE();
 
-    pb =[NSPasteboard generalPasteboard];
+    pb = [NSPasteboard generalPasteboard];
 
     if (nil == pb) {
- [self copy_completed:selection];
+        [self copy_completed:selection];
         free_propdata(pdata);
         return;
     }
 
     /*
      * Some apps it seems set the type to TARGETS instead of ATOM, such as Eterm.
-     * These aren't ICCCM compliant apps, but we need these to work... 
+     * These aren't ICCCM compliant apps, but we need these to work...
      */
     if (request_atom == atoms->targets
         && (type == atoms->atom || type == atoms->targets)) {
- [self handle_targets: selection propdata:pdata];
+        [self handle_targets:selection propdata:pdata];
         free_propdata(pdata);
         return;
     }
     else if (type == atoms->image_png) {
- [self handle_image: pdata pasteboard:pb];
+        [self handle_image:pdata pasteboard:pb];
     }
     else if (type == atoms->image_jpeg) {
- [self handle_image: pdata pasteboard:pb];
+        [self handle_image:pdata pasteboard:pb];
     }
     else if (type == atoms->utf8_string) {
- [self handle_utf8_string: pdata pasteboard:pb];
+        [self handle_utf8_string:pdata pasteboard:pb];
     }
     else if (type == atoms->string) {
- [self handle_string: pdata pasteboard:pb];
+        [self handle_string:pdata pasteboard:pb];
     }
 
     free_propdata(pdata);
 
- [self copy_completed:selection];
+    [self copy_completed:selection];
 }
 
- -(void) copy_completed:(Atom) selection {
+- (void) copy_completed:(Atom)selection
+{
     TRACE();
     char *name;
 
-    (void) name;                /* Avoid warning with non-debug compiles. */
+    (void)name; /* Avoid warning with non-debug compiles. */
 #ifdef DEBUG
     name = XGetAtomName(xpbproxy_dpy, selection);
     if (name) {
@@ -1382,39 +1412,45 @@ type propdata:(struct propdata *) pdata
         }
     }
 
-    /* 
+    /*
      * We had 1 or more primary in progress, and the clipboard arrived
-     * while we were busy. 
+     * while we were busy.
      */
     if (pending_clipboard > 0) {
         [self claim_clipboard];
     }
 }
 
--(void) reload_preferences {
+- (void) reload_preferences
+{
     /*
      * It's uncertain how we could handle the synchronization failing, so cast to void.
      * The prefs_get_bool should fall back to defaults if the org.x.X11 plist doesn't exist or is invalid.
      */
-    (void) CFPreferencesAppSynchronize(app_prefs_domain_cfstr);
+    (void)CFPreferencesAppSynchronize(app_prefs_domain_cfstr);
 #ifdef STANDALONE_XPBPROXY
     if (xpbproxy_is_standalone)
         pbproxy_prefs.active = YES;
     else
 #endif
-        pbproxy_prefs.active =
-            prefs_get_bool(CFSTR("sync_pasteboard"), pbproxy_prefs.active);
+    pbproxy_prefs.active = prefs_get_bool(CFSTR(
+                                              "sync_pasteboard"),
+                                          pbproxy_prefs.active);
     pbproxy_prefs.primary_on_grab =
-        prefs_get_bool(CFSTR("sync_primary_on_select"),
+        prefs_get_bool(CFSTR(
+                           "sync_primary_on_select"),
                        pbproxy_prefs.primary_on_grab);
     pbproxy_prefs.clipboard_to_pasteboard =
-        prefs_get_bool(CFSTR("sync_clipboard_to_pasteboard"),
+        prefs_get_bool(CFSTR(
+                           "sync_clipboard_to_pasteboard"),
                        pbproxy_prefs.clipboard_to_pasteboard);
     pbproxy_prefs.pasteboard_to_primary =
-        prefs_get_bool(CFSTR("sync_pasteboard_to_primary"),
+        prefs_get_bool(CFSTR(
+                           "sync_pasteboard_to_primary"),
                        pbproxy_prefs.pasteboard_to_primary);
     pbproxy_prefs.pasteboard_to_clipboard =
-        prefs_get_bool(CFSTR("sync_pasteboard_to_clipboard"),
+        prefs_get_bool(CFSTR(
+                           "sync_pasteboard_to_clipboard"),
                        pbproxy_prefs.pasteboard_to_clipboard);
 
     /* This is used for debugging. */
@@ -1422,38 +1458,40 @@ type propdata:(struct propdata *) pdata
 
     if (pbproxy_prefs.active && pbproxy_prefs.primary_on_grab &&
         !xpbproxy_have_xfixes) {
-        ErrorF
-            ("Disabling sync_primary_on_select functionality due to missing XFixes extension.\n");
+        ErrorF(
+            "Disabling sync_primary_on_select functionality due to missing XFixes extension.\n");
         pbproxy_prefs.primary_on_grab = NO;
     }
 
     /* Claim or release the CLIPBOARD_MANAGER atom */
- if (![self set_clipboard_manager_status:(pbproxy_prefs.active &&
-     pbproxy_prefs.
-     clipboard_to_pasteboard)])
+    if (![self set_clipboard_manager_status:(pbproxy_prefs.active &&
+                                             pbproxy_prefs.
+                                             clipboard_to_pasteboard)])
         pbproxy_prefs.clipboard_to_pasteboard = NO;
 
     if (pbproxy_prefs.active && pbproxy_prefs.clipboard_to_pasteboard)
         [self claim_clipboard];
 }
 
--(BOOL) is_active {
+- (BOOL) is_active
+{
     return pbproxy_prefs.active;
 }
 
 /* NSPasteboard-required methods */
 
- -(void) paste:(id) sender {
+- (void) paste:(id)sender
+{
     TRACE();
 }
 
- -(void) pasteboard:(NSPasteboard *)
-pb provideDataForType:(NSString *) type
+- (void) pasteboard:(NSPasteboard *)pb provideDataForType:(NSString *)type
 {
     TRACE();
 }
 
- -(void) pasteboardChangedOwner:(NSPasteboard *) pb {
+- (void) pasteboardChangedOwner:(NSPasteboard *)pb
+{
     TRACE();
 
     /* Right now we don't care with this. */
@@ -1461,10 +1499,11 @@ pb provideDataForType:(NSString *) type
 
 /* Allocation */
 
--init {
+- init
+{
     unsigned long pixel;
 
-    self =[super init];
+    self = [super init];
     if (self == nil)
         return nil;
 
@@ -1480,15 +1519,15 @@ pb provideDataForType:(NSString *) type
     atoms->image_jpeg = XInternAtom(xpbproxy_dpy, "image/jpeg", False);
     atoms->incr = XInternAtom(xpbproxy_dpy, "INCR", False);
     atoms->atom = XInternAtom(xpbproxy_dpy, "ATOM", False);
-    atoms->clipboard_manager =
-        XInternAtom(xpbproxy_dpy, "CLIPBOARD_MANAGER", False);
+    atoms->clipboard_manager = XInternAtom(xpbproxy_dpy, "CLIPBOARD_MANAGER",
+                                           False);
     atoms->compound_text = XInternAtom(xpbproxy_dpy, "COMPOUND_TEXT", False);
     atoms->atom_pair = XInternAtom(xpbproxy_dpy, "ATOM_PAIR", False);
 
     pixel = BlackPixel(xpbproxy_dpy, DefaultScreen(xpbproxy_dpy));
     _selection_window =
-        XCreateSimpleWindow(xpbproxy_dpy, DefaultRootWindow(xpbproxy_dpy), 0, 0,
-                            1, 1, 0, pixel, pixel);
+        XCreateSimpleWindow(xpbproxy_dpy, DefaultRootWindow(xpbproxy_dpy),
+                            0, 0, 1, 1, 0, pixel, pixel);
 
     /* This is used to get PropertyNotify events when doing INCR transfers. */
     XSelectInput(xpbproxy_dpy, _selection_window, PropertyChangeMask);
@@ -1512,7 +1551,8 @@ pb provideDataForType:(NSString *) type
     return self;
 }
 
--(void) dealloc {
+- (void) dealloc
+{
     if (None != _selection_window) {
         XDestroyWindow(xpbproxy_dpy, _selection_window);
         _selection_window = None;
diff --git a/xorg-server/hw/xquartz/pseudoramiX.c b/xorg-server/hw/xquartz/pseudoramiX.c
index f5375039b..8bb7f2d01 100644
--- a/xorg-server/hw/xquartz/pseudoramiX.c
+++ b/xorg-server/hw/xquartz/pseudoramiX.c
@@ -9,29 +9,29 @@
  * following copyright notice:
  */
 /*****************************************************************
-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-******************************************************************/
+   Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+   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.
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+   BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+   IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   Except as contained in this notice, the name of Digital Equipment Corporation
+   shall not be used in advertising or otherwise to promote the sale, use or other
+   dealings in this Software without prior written authorization from Digital
+   Equipment Corporation.
+ ******************************************************************/
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
@@ -47,25 +47,41 @@ Equipment Corporation.
 
 Bool noPseudoramiXExtension = FALSE;
 
-extern int ProcPanoramiXQueryVersion(ClientPtr client);
+extern int
+ProcPanoramiXQueryVersion(ClientPtr client);
 
-static void PseudoramiXResetProc(ExtensionEntry * extEntry);
+static void
+PseudoramiXResetProc(ExtensionEntry *extEntry);
 
-static int ProcPseudoramiXQueryVersion(ClientPtr client);
-static int ProcPseudoramiXGetState(ClientPtr client);
-static int ProcPseudoramiXGetScreenCount(ClientPtr client);
-static int ProcPseudoramiXGetScreenSize(ClientPtr client);
-static int ProcPseudoramiXIsActive(ClientPtr client);
-static int ProcPseudoramiXQueryScreens(ClientPtr client);
-static int ProcPseudoramiXDispatch(ClientPtr client);
+static int
+ProcPseudoramiXQueryVersion(ClientPtr client);
+static int
+ProcPseudoramiXGetState(ClientPtr client);
+static int
+ProcPseudoramiXGetScreenCount(ClientPtr client);
+static int
+ProcPseudoramiXGetScreenSize(ClientPtr client);
+static int
+ProcPseudoramiXIsActive(ClientPtr client);
+static int
+ProcPseudoramiXQueryScreens(ClientPtr client);
+static int
+ProcPseudoramiXDispatch(ClientPtr client);
 
-static int SProcPseudoramiXQueryVersion(ClientPtr client);
-static int SProcPseudoramiXGetState(ClientPtr client);
-static int SProcPseudoramiXGetScreenCount(ClientPtr client);
-static int SProcPseudoramiXGetScreenSize(ClientPtr client);
-static int SProcPseudoramiXIsActive(ClientPtr client);
-static int SProcPseudoramiXQueryScreens(ClientPtr client);
-static int SProcPseudoramiXDispatch(ClientPtr client);
+static int
+SProcPseudoramiXQueryVersion(ClientPtr client);
+static int
+SProcPseudoramiXGetState(ClientPtr client);
+static int
+SProcPseudoramiXGetScreenCount(ClientPtr client);
+static int
+SProcPseudoramiXGetScreenSize(ClientPtr client);
+static int
+SProcPseudoramiXIsActive(ClientPtr client);
+static int
+SProcPseudoramiXQueryScreens(ClientPtr client);
+static int
+SProcPseudoramiXDispatch(ClientPtr client);
 
 typedef struct {
     int x;
@@ -88,8 +104,7 @@ PseudoramiXAddScreen(int x, int y, int w, int h)
 {
     PseudoramiXScreenRec *s;
 
-    if (noPseudoramiXExtension)
-        return;
+    if (noPseudoramiXExtension) return;
 
     if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {
         pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;
@@ -113,10 +128,9 @@ void
 PseudoramiXExtensionInit(int argc, char *argv[])
 {
     Bool success = FALSE;
-    ExtensionEntry *extEntry;
+    ExtensionEntry      *extEntry;
 
-    if (noPseudoramiXExtension)
-        return;
+    if (noPseudoramiXExtension) return;
 
     TRACE();
 
@@ -134,7 +148,8 @@ PseudoramiXExtensionInit(int argc, char *argv[])
         extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
                                 ProcPseudoramiXDispatch,
                                 SProcPseudoramiXDispatch,
-                                PseudoramiXResetProc, StandardMinorOpcode);
+                                PseudoramiXResetProc,
+                                StandardMinorOpcode);
         if (!extEntry) {
             ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");
         }
@@ -160,7 +175,7 @@ PseudoramiXResetScreens(void)
 }
 
 static void
-PseudoramiXResetProc(ExtensionEntry * extEntry)
+PseudoramiXResetProc(ExtensionEntry *extEntry)
 {
     TRACE();
 
@@ -201,7 +216,7 @@ ProcPseudoramiXGetState(ClientPtr client)
         swapl(&rep.length);
         swaps(&rep.state);
     }
-    WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *) &rep);
+    WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
     return Success;
 }
 
@@ -230,7 +245,7 @@ ProcPseudoramiXGetScreenCount(ClientPtr client)
         swapl(&rep.length);
         swaps(&rep.ScreenCount);
     }
-    WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *) &rep);
+    WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
     return Success;
 }
 
@@ -264,7 +279,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
         swaps(&rep.width);
         swaps(&rep.height);
     }
-    WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *) &rep);
+    WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
     return Success;
 }
 
@@ -288,7 +303,7 @@ ProcPseudoramiXIsActive(ClientPtr client)
         swapl(&rep.length);
         swapl(&rep.state);
     }
-    WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
+    WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *)&rep);
     return Success;
 }
 
@@ -300,7 +315,8 @@ ProcPseudoramiXQueryScreens(ClientPtr client)
     xXineramaQueryScreensReply rep;
 
     DEBUG_LOG("noPseudoramiXExtension=%d, pseudoramiXNumScreens=%d\n",
-              noPseudoramiXExtension, pseudoramiXNumScreens);
+              noPseudoramiXExtension,
+              pseudoramiXNumScreens);
 
     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
 
@@ -313,7 +329,7 @@ ProcPseudoramiXQueryScreens(ClientPtr client)
         swapl(&rep.length);
         swapl(&rep.number);
     }
-    WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *) &rep);
+    WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
 
     if (!noPseudoramiXExtension) {
         xXineramaScreenInfo scratch;
@@ -331,7 +347,7 @@ ProcPseudoramiXQueryScreens(ClientPtr client)
                 swaps(&scratch.width);
                 swaps(&scratch.height);
             }
-            WriteToClient(client, sz_XineramaScreenInfo, (char *) &scratch);
+            WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
         }
     }
 
@@ -347,14 +363,19 @@ ProcPseudoramiXDispatch(ClientPtr client)
     switch (stuff->data) {
     case X_PanoramiXQueryVersion:
         return ProcPseudoramiXQueryVersion(client);
+
     case X_PanoramiXGetState:
         return ProcPseudoramiXGetState(client);
+
     case X_PanoramiXGetScreenCount:
         return ProcPseudoramiXGetScreenCount(client);
+
     case X_PanoramiXGetScreenSize:
         return ProcPseudoramiXGetScreenSize(client);
+
     case X_XineramaIsActive:
         return ProcPseudoramiXIsActive(client);
+
     case X_XineramaQueryScreens:
         return ProcPseudoramiXQueryScreens(client);
     }
@@ -443,14 +464,19 @@ SProcPseudoramiXDispatch(ClientPtr client)
     switch (stuff->data) {
     case X_PanoramiXQueryVersion:
         return SProcPseudoramiXQueryVersion(client);
+
     case X_PanoramiXGetState:
         return SProcPseudoramiXGetState(client);
+
     case X_PanoramiXGetScreenCount:
         return SProcPseudoramiXGetScreenCount(client);
+
     case X_PanoramiXGetScreenSize:
         return SProcPseudoramiXGetScreenSize(client);
+
     case X_XineramaIsActive:
         return SProcPseudoramiXIsActive(client);
+
     case X_XineramaQueryScreens:
         return SProcPseudoramiXQueryScreens(client);
     }
diff --git a/xorg-server/hw/xquartz/pseudoramiX.h b/xorg-server/hw/xquartz/pseudoramiX.h
index df5010d1d..f41b5cbe4 100644
--- a/xorg-server/hw/xquartz/pseudoramiX.h
+++ b/xorg-server/hw/xquartz/pseudoramiX.h
@@ -4,6 +4,8 @@
 
 extern int noPseudoramiXExtension;
 
-void PseudoramiXAddScreen(int x, int y, int w, int h);
+void
+PseudoramiXAddScreen(int x, int y, int w, int h);
 void PseudoramiXExtensionInit(int argc, char *argv[]);
-void PseudoramiXResetScreens(void);
+void
+PseudoramiXResetScreens(void);
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index e4578cc3e..ebaa56785 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -2,6 +2,7 @@
  *
  * Quartz-specific support for the Darwin X Server
  *
+ * Copyright (c) 2002-2012 Apple Inc. All rights reserved.
  * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons.
  *                 All Rights Reserved.
  *
@@ -71,7 +72,7 @@
 DevPrivateKeyRec quartzScreenKeyRec;
 int aquaMenuBarHeight = 0;
 QuartzModeProcsPtr quartzProcs = NULL;
-const char *quartzOpenGLBundle = NULL;
+const char             *quartzOpenGLBundle = NULL;
 
 Bool XQuartzFullscreenDisableHotkeys = TRUE;
 Bool XQuartzOptionSendsAlt = FALSE;
@@ -85,19 +86,20 @@ Bool XQuartzFullscreenMenu = FALSE;
 int32_t XQuartzShieldingWindowLevel = 0;
 
 /*
-===========================================================================
+   ===========================================================================
 
- Screen functions
+   Screen functions
 
-===========================================================================
-*/
+   ===========================================================================
+ */
 
 /*
  * QuartzAddScreen
  *  Do mode dependent initialization of each screen for Quartz.
  */
 Bool
-QuartzAddScreen(int index, ScreenPtr pScreen)
+QuartzAddScreen(int index,
+                ScreenPtr pScreen)
 {
     // allocate space for private per screen Quartz specific storage
     QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);
@@ -114,7 +116,8 @@ QuartzAddScreen(int index, ScreenPtr pScreen)
  *  Finalize mode specific setup of each screen.
  */
 Bool
-QuartzSetupScreen(int index, ScreenPtr pScreen)
+QuartzSetupScreen(int index,
+                  ScreenPtr pScreen)
 {
     // do Quartz mode specific setup
     if (!quartzProcs->SetupScreen(index, pScreen))
@@ -139,7 +142,8 @@ QuartzSetupScreen(int index, ScreenPtr pScreen)
  *  Quartz display initialization.
  */
 void
-QuartzInitOutput(int argc, char **argv)
+QuartzInitOutput(int argc,
+                 char **argv)
 {
     /* For XQuartz, we want to just use the default signal handler to work better with CrashTracer */
     signal(SIGSEGV, SIG_DFL);
@@ -162,7 +166,8 @@ QuartzInitOutput(int argc, char **argv)
 #endif
 
     if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,
-                                        QuartzWakeupHandler, NULL)) {
+                                        QuartzWakeupHandler,
+                                        NULL)) {
         FatalError("Could not register block and wakeup handlers.");
     }
 
@@ -178,7 +183,8 @@ QuartzInitOutput(int argc, char **argv)
  *  Inform the main thread the X server is ready to handle events.
  */
 void
-QuartzInitInput(int argc, char **argv)
+QuartzInitInput(int argc,
+                char **argv)
 {
     X11ApplicationSetCanQuit(0);
     X11ApplicationServerReady();
@@ -212,8 +218,8 @@ QuartzUpdateScreens(void)
 
     pScreen->x = x;
     pScreen->y = y;
-    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);
-    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);
+    pScreen->mmWidth = pScreen->mmWidth * ((double)width / pScreen->width);
+    pScreen->mmHeight = pScreen->mmHeight * ((double)height / pScreen->height);
     pScreen->width = width;
     pScreen->height = height;
 
@@ -241,10 +247,11 @@ QuartzUpdateScreens(void)
     inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;
     inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;
 
-    DEBUG_LOG
-        ("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n",
-         width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x,
-         y, pScreen->x, pScreen->y);
+    DEBUG_LOG(
+        "Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n",
+        width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY,
+        x, y,
+        pScreen->x, pScreen->y);
 
     /* Send an event for the root reconfigure */
     e.u.u.type = ConfigureNotify;
@@ -278,7 +285,7 @@ QuartzScreenSaver(int state)
 {
     static CFRunLoopTimerRef pokeActivityTimer = NULL;
     static CFRunLoopTimerContext pokeActivityContext =
-        { 0, NULL, NULL, NULL, NULL };
+    { 0, NULL, NULL, NULL, NULL };
     static OSSpinLock pokeActivitySpinLock = OS_SPINLOCK_INIT;
 
     OSSpinLockLock(&pokeActivitySpinLock);
@@ -295,18 +302,20 @@ QuartzScreenSaver(int state)
         if (pokeActivityTimer != NULL)
             goto QuartzScreenSaverEnd;
 
-        pokeActivityTimer =
-            CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0,
-                                 pokeActivityCallback, &pokeActivityContext);
+        pokeActivityTimer = CFRunLoopTimerCreate(NULL,
+                                                 CFAbsoluteTimeGetCurrent(),
+                                                 30, 0, 0,
+                                                 pokeActivityCallback,
+                                                 &pokeActivityContext);
         if (pokeActivityTimer == NULL) {
             ErrorF("Unable to create pokeActivityTimer.\n");
             goto QuartzScreenSaverEnd;
         }
 
-        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer,
-                          kCFRunLoopCommonModes);
+        CFRunLoopAddTimer(
+            CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);
     }
- QuartzScreenSaverEnd:
+QuartzScreenSaverEnd:
     OSSpinLockUnlock(&pokeActivitySpinLock);
 }
 
@@ -340,7 +349,6 @@ QuartzShowFullscreen(int state)
         RootlessShowAllWindows();
         for (i = 0; i < screenInfo.numScreens; i++) {
             ScreenPtr pScreen = screenInfo.screens[i];
-
             RootlessRepositionWindows(pScreen);
             // JH: I don't think this is necessary, but keeping it here as a reminder
             //RootlessUpdateScreenPixmap(pScreen);
@@ -348,7 +356,7 @@ QuartzShowFullscreen(int state)
     }
 
     /* Somehow the menubar manages to interfere with our event stream
-     * in fullscreen mode, even though it's not visible. 
+     * in fullscreen mode, even though it's not visible.
      */
     X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);
 
@@ -458,7 +466,7 @@ QuartzSetRootClip(BOOL enable)
     }
 }
 
-/* 
+/*
  * QuartzSpaceChanged
  *  Unmap offscreen windows, map onscreen windows
  */
@@ -466,7 +474,8 @@ void
 QuartzSpaceChanged(uint32_t space_id)
 {
     /* Do something special here, so we don't depend on quartz-wm for spaces to work... */
-    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);
+    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n",
+              space_id);
 }
 
 /*
@@ -476,14 +485,13 @@ QuartzSpaceChanged(uint32_t space_id)
  */
 void
 QuartzCopyDisplayIDs(ScreenPtr pScreen,
-                     int displayCount, CGDirectDisplayID * displayIDs)
+                     int displayCount, CGDirectDisplayID *displayIDs)
 {
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
     free(pQuartzScreen->displayIDs);
     if (displayCount) {
         size_t size = displayCount * sizeof(CGDirectDisplayID);
-
         pQuartzScreen->displayIDs = malloc(size);
         memcpy(pQuartzScreen->displayIDs, displayIDs, size);
     }
@@ -493,11 +501,12 @@ QuartzCopyDisplayIDs(ScreenPtr pScreen,
     pQuartzScreen->displayCount = displayCount;
 }
 
-void NSBeep(void);
 void
-DDXRingBell(int volume,         // volume is % of max
-            int pitch,          // pitch is Hz
-            int duration)       // duration is milliseconds
+NSBeep(void);
+void
+DDXRingBell(int volume,              // volume is % of max
+            int pitch,               // pitch is Hz
+            int duration)            // duration is milliseconds
 {
     if (volume)
         NSBeep();
diff --git a/xorg-server/hw/xquartz/quartz.h b/xorg-server/hw/xquartz/quartz.h
index 0a9c47a6b..47c44162f 100644
--- a/xorg-server/hw/xquartz/quartz.h
+++ b/xorg-server/hw/xquartz/quartz.h
@@ -4,6 +4,7 @@
  * External interface of the Quartz display modes seen by the generic, mode
  * independent parts of the Darwin X server.
  *
+ * Copyright (c) 2002-2012 Apple Inc. All rights reserved.
  * Copyright (c) 2001-2003 Greg Parker and Torrey T. Lyons.
  *                 All Rights Reserved.
  *
@@ -39,7 +40,7 @@
 
 /*------------------------------------------
    Quartz display mode function types
-  ------------------------------------------*/
+   ------------------------------------------*/
 
 /*
  * Display mode initialization
@@ -80,12 +81,12 @@ typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);
 typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);
 typedef Bool (*CreateSurfaceProc)
     (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
-     unsigned int client_id, unsigned int *surface_id,
-     unsigned int key[2], void (*notify) (void *arg, void *data),
-     void *notify_data);
+    unsigned int client_id, unsigned int *surface_id,
+    unsigned int key[2], void (*notify)(void *arg, void *data),
+    void *notify_data);
 typedef Bool (*DestroySurfaceProc)
     (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
-     void (*notify) (void *arg, void *data), void *notify_data);
+    void (*notify)(void *arg, void *data), void *notify_data);
 
 /*
  * Quartz display mode function list
@@ -126,22 +127,37 @@ extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */
 
 extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */
 
-Bool QuartzAddScreen(int index, ScreenPtr pScreen);
-Bool QuartzSetupScreen(int index, ScreenPtr pScreen);
-void QuartzInitOutput(int argc,char **argv);
-void QuartzInitInput(int argc, char **argv);
-void QuartzInitServer(int argc, char **argv, char **envp);
-void QuartzGiveUp(void);
-void QuartzProcessEvent(xEvent *xe);
-void QuartzUpdateScreens(void);
-
-void QuartzShow(void);
-void QuartzHide(void);
-void QuartzSetRootClip(BOOL enable);
-void QuartzSpaceChanged(uint32_t space_id);
-
-void QuartzSetRootless(Bool state);
-void QuartzShowFullscreen(Bool state);
-
-int server_main(int argc, char **argv, char **envp);
+Bool
+QuartzAddScreen(int index, ScreenPtr pScreen);
+Bool
+QuartzSetupScreen(int index, ScreenPtr pScreen);
+void
+QuartzInitOutput(int argc, char **argv);
+void
+QuartzInitInput(int argc, char **argv);
+void
+QuartzInitServer(int argc, char **argv, char **envp);
+void
+QuartzGiveUp(void);
+void
+QuartzProcessEvent(xEvent *xe);
+void
+QuartzUpdateScreens(void);
+
+void
+QuartzShow(void);
+void
+QuartzHide(void);
+void
+QuartzSetRootClip(BOOL enable);
+void
+QuartzSpaceChanged(uint32_t space_id);
+
+void
+QuartzSetRootless(Bool state);
+void
+QuartzShowFullscreen(Bool state);
+
+int
+server_main(int argc, char **argv, char **envp);
 #endif
diff --git a/xorg-server/hw/xquartz/quartzCocoa.m b/xorg-server/hw/xquartz/quartzCocoa.m
index c0401b5e1..db2b3cfd6 100644
--- a/xorg-server/hw/xquartz/quartzCocoa.m
+++ b/xorg-server/hw/xquartz/quartzCocoa.m
@@ -48,19 +48,23 @@
  *  Clean out any autoreleased objects.
  */
 void
-QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+QuartzBlockHandler(pointer blockData,
+                   OSTimePtr pTimeout,
+                   pointer pReadmask)
 {
     static NSAutoreleasePool *aPool = nil;
 
     [aPool release];
-    aPool =[[NSAutoreleasePool alloc] init];
+    aPool = [[NSAutoreleasePool alloc] init];
 }
 
 /*
  * QuartzWakeupHandler
  */
 void
-QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask)
+QuartzWakeupHandler(pointer blockData,
+                    int result,
+                    pointer pReadmask)
 {
     // nothing here
 }
diff --git a/xorg-server/hw/xquartz/quartzCommon.h b/xorg-server/hw/xquartz/quartzCommon.h
index e12e1d25c..813bc7713 100644
--- a/xorg-server/hw/xquartz/quartzCommon.h
+++ b/xorg-server/hw/xquartz/quartzCommon.h
@@ -40,15 +40,15 @@
 
 // Other shared data
 extern DevPrivateKeyRec quartzScreenKeyRec;
-
 #define quartzScreenKey (&quartzScreenKeyRec)
 extern int aquaMenuBarHeight;
 
 // Name of GLX bundle for native OpenGL
-extern const char *quartzOpenGLBundle;
+extern const char      *quartzOpenGLBundle;
 
-void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout,
-                        pointer pReadmask);
-void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
+void
+QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask);
+void
+QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
 
-#endif                          /* _QUARTZCOMMON_H */
+#endif  /* _QUARTZCOMMON_H */
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index e7aadbcf5..84e34d916 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -1,7 +1,7 @@
 /*
    quartzKeyboard.c: Keyboard support for Xquartz
 
-   Copyright (c) 2003-2008 Apple Inc.
+   Copyright (c) 2003-2012 Apple Inc.
    Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
    Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
 
@@ -29,7 +29,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include "sanitizedCarbon.h"
 
@@ -37,8 +37,8 @@
 #include <dix-config.h>
 #endif
 
-#define HACK_MISSING 1
-#define HACK_KEYPAD 1
+#define HACK_MISSING   1
+#define HACK_KEYPAD    1
 #define HACK_BLACKLIST 1
 
 #include <unistd.h>
@@ -65,7 +65,7 @@
 #include "keysym2ucs.h"
 
 extern void
- CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
+CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 
 enum {
     MOD_COMMAND = 256,
@@ -84,31 +84,33 @@ const static struct {
     unsigned short keycode;
     KeySym keysym;
 } known_keys[] = {
-    {
-    55, XK_Meta_L}, {
-    56, XK_Shift_L}, {
-    57, XK_Caps_Lock}, {
-    58, XK_Alt_L}, {
-    59, XK_Control_L}, {
-    60, XK_Shift_R}, {
-    61, XK_Alt_R}, {
-    62, XK_Control_R}, {
-    63, XK_Meta_R}, {
-    122, XK_F1}, {
-    120, XK_F2}, {
-    99, XK_F3}, {
-    118, XK_F4}, {
-    96, XK_F5}, {
-    97, XK_F6}, {
-    98, XK_F7}, {
-    100, XK_F8}, {
-    101, XK_F9}, {
-    109, XK_F10}, {
-    103, XK_F11}, {
-    111, XK_F12}, {
-    105, XK_F13}, {
-    107, XK_F14}, {
-113, XK_F15},};
+    { 55,  XK_Meta_L        },
+    { 56,  XK_Shift_L       },
+    { 57,  XK_Caps_Lock     },
+    { 58,  XK_Alt_L         },
+    { 59,  XK_Control_L     },
+
+    { 60,  XK_Shift_R       },
+    { 61,  XK_Alt_R         },
+    { 62,  XK_Control_R     },
+    { 63,  XK_Meta_R        },
+
+    { 122, XK_F1            },
+    { 120, XK_F2            },
+    { 99,  XK_F3            },
+    { 118, XK_F4            },
+    { 96,  XK_F5            },
+    { 97,  XK_F6            },
+    { 98,  XK_F7            },
+    { 100, XK_F8            },
+    { 101, XK_F9            },
+    { 109, XK_F10           },
+    { 103, XK_F11           },
+    { 111, XK_F12           },
+    { 105, XK_F13           },
+    { 107, XK_F14           },
+    { 113, XK_F15           },
+};
 #endif
 
 #if HACK_KEYPAD
@@ -119,24 +121,24 @@ const static struct {
     unsigned short keycode;
     KeySym normal, keypad;
 } known_numeric_keys[] = {
-    {
-    65, XK_period, XK_KP_Decimal}, {
-    67, XK_asterisk, XK_KP_Multiply}, {
-    69, XK_plus, XK_KP_Add}, {
-    75, XK_slash, XK_KP_Divide}, {
-    76, 0x01000003, XK_KP_Enter}, {
-    78, XK_minus, XK_KP_Subtract}, {
-    81, XK_equal, XK_KP_Equal}, {
-    82, XK_0, XK_KP_0}, {
-    83, XK_1, XK_KP_1}, {
-    84, XK_2, XK_KP_2}, {
-    85, XK_3, XK_KP_3}, {
-    86, XK_4, XK_KP_4}, {
-    87, XK_5, XK_KP_5}, {
-    88, XK_6, XK_KP_6}, {
-    89, XK_7, XK_KP_7}, {
-    91, XK_8, XK_KP_8}, {
-92, XK_9, XK_KP_9},};
+    { 65, XK_period,   XK_KP_Decimal                              },
+    { 67, XK_asterisk, XK_KP_Multiply                             },
+    { 69, XK_plus,     XK_KP_Add                                  },
+    { 75, XK_slash,    XK_KP_Divide                               },
+    { 76, 0x01000003,  XK_KP_Enter                                },
+    { 78, XK_minus,    XK_KP_Subtract                             },
+    { 81, XK_equal,    XK_KP_Equal                                },
+    { 82, XK_0,        XK_KP_0                                    },
+    { 83, XK_1,        XK_KP_1                                    },
+    { 84, XK_2,        XK_KP_2                                    },
+    { 85, XK_3,        XK_KP_3                                    },
+    { 86, XK_4,        XK_KP_4                                    },
+    { 87, XK_5,        XK_KP_5                                    },
+    { 88, XK_6,        XK_KP_6                                    },
+    { 89, XK_7,        XK_KP_7                                    },
+    { 91, XK_8,        XK_KP_8                                    },
+    { 92, XK_9,        XK_KP_9                                    },
+};
 #endif
 
 #if HACK_BLACKLIST
@@ -155,40 +157,30 @@ const static unsigned short keycode_blacklist[] = { 66, 70, 72, 77 };
 const static struct {
     KeySym normal, dead;
 } dead_keys[] = {
-    {
-    XK_grave, XK_dead_grave}, {
-    XK_apostrophe, XK_dead_acute},      /* US:"=" on a Czech keyboard */
-    {
-    XK_acute, XK_dead_acute}, {
-    UKEYSYM(0x384), XK_dead_acute},     /* US:";" on a Greek keyboard */
-//    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */
-    {
-    XK_asciicircum, XK_dead_circumflex}, {
-    UKEYSYM(0x2c6), XK_dead_circumflex},        /* MODIFIER LETTER CIRCUMFLEX ACCENT */
-    {
-    XK_asciitilde, XK_dead_tilde}, {
-    UKEYSYM(0x2dc), XK_dead_tilde},     /* SMALL TILDE */
-    {
-    XK_macron, XK_dead_macron}, {
-    XK_breve, XK_dead_breve}, {
-    XK_abovedot, XK_dead_abovedot}, {
-    XK_diaeresis, XK_dead_diaeresis}, {
-    UKEYSYM(0x2da), XK_dead_abovering}, /* DOT ABOVE */
-    {
-    XK_doubleacute, XK_dead_doubleacute}, {
-    XK_caron, XK_dead_caron}, {
-    XK_cedilla, XK_dead_cedilla}, {
-    XK_ogonek, XK_dead_ogonek}, {
-    UKEYSYM(0x269), XK_dead_iota},      /* LATIN SMALL LETTER IOTA */
-    {
-    UKEYSYM(0x2ec), XK_dead_voiced_sound},      /* MODIFIER LETTER VOICING */
-/*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */
-    {
-    UKEYSYM(0x323), XK_dead_belowdot},  /* COMBINING DOT BELOW */
-    {
-    UKEYSYM(0x309), XK_dead_hook},      /* COMBINING HOOK ABOVE */
-    {
-    UKEYSYM(0x31b), XK_dead_horn},      /* COMBINING HORN */
+    { XK_grave,       XK_dead_grave                                },
+    { XK_apostrophe,  XK_dead_acute                                }, /* US:"=" on a Czech keyboard */
+    { XK_acute,       XK_dead_acute                                },
+    { UKEYSYM(0x384), XK_dead_acute                                }, /* US:";" on a Greek keyboard */
+    //    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */
+    { XK_asciicircum, XK_dead_circumflex                           },
+    { UKEYSYM(0x2c6), XK_dead_circumflex                           }, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+    { XK_asciitilde,  XK_dead_tilde                                },
+    { UKEYSYM(0x2dc), XK_dead_tilde                                }, /* SMALL TILDE */
+    { XK_macron,      XK_dead_macron                               },
+    { XK_breve,       XK_dead_breve                                },
+    { XK_abovedot,    XK_dead_abovedot                             },
+    { XK_diaeresis,   XK_dead_diaeresis                            },
+    { UKEYSYM(0x2da), XK_dead_abovering                            }, /* DOT ABOVE */
+    { XK_doubleacute, XK_dead_doubleacute                          },
+    { XK_caron,       XK_dead_caron                                },
+    { XK_cedilla,     XK_dead_cedilla                              },
+    { XK_ogonek,      XK_dead_ogonek                               },
+    { UKEYSYM(0x269), XK_dead_iota                                 }, /* LATIN SMALL LETTER IOTA */
+    { UKEYSYM(0x2ec), XK_dead_voiced_sound                         }, /* MODIFIER LETTER VOICING */
+    /*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */
+    { UKEYSYM(0x323), XK_dead_belowdot                             }, /* COMBINING DOT BELOW */
+    { UKEYSYM(0x309), XK_dead_hook                                 }, /* COMBINING HOOK ABOVE */
+    { UKEYSYM(0x31b), XK_dead_horn                                 }, /* COMBINING HORN */
 };
 
 typedef struct darwinKeyboardInfo_struct {
@@ -201,7 +193,7 @@ darwinKeyboardInfo keyInfo;
 pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static void
-DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl * ctrl)
+DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl)
 {
     // FIXME: to be implemented
     // keyclick, bell volume / pitch, autorepead, LED's
@@ -217,7 +209,7 @@ DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl * ctrl)
  *      the modMap and modifierKeycodes fields.
  */
 static void
-DarwinBuildModifierMaps(darwinKeyboardInfo * info)
+DarwinBuildModifierMaps(darwinKeyboardInfo *info)
 {
     int i;
     KeySym *k;
@@ -266,7 +258,7 @@ DarwinBuildModifierMaps(darwinKeyboardInfo * info)
             info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
             info->modMap[MIN_KEYCODE + i] = Mod1Mask;
             if (!XQuartzOptionSendsAlt)
-                *k = XK_Mode_switch;    // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                *k = XK_Mode_switch;     // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
             break;
 
         case XK_Alt_R:
@@ -276,13 +268,13 @@ DarwinBuildModifierMaps(darwinKeyboardInfo * info)
             info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
 #endif
             if (!XQuartzOptionSendsAlt)
-                *k = XK_Mode_switch;    // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                *k = XK_Mode_switch;     // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
             info->modMap[MIN_KEYCODE + i] = Mod1Mask;
             break;
 
         case XK_Mode_switch:
-            ErrorF
-                ("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
+            ErrorF(
+                "DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
             info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
 #ifdef NX_MODIFIERKEY_RALTERNATE
             info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
@@ -339,7 +331,7 @@ static void
 DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue,
                         int keyRepeatValue)
 {
-    if (initialKeyRepeatValue == 300000) {      // off
+    if (initialKeyRepeatValue == 300000) { // off
         /* Turn off repeats globally */
         XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);
     }
@@ -405,7 +397,7 @@ DarwinKeyboardReloadHandler(void)
     DEBUG_LOG("DarwinKeyboardReloadHandler\n");
 
     /* Get our key repeat settings from GlobalPreferences */
-    (void) CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+    (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
 
     initialKeyRepeatValue =
         CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"),
@@ -413,13 +405,16 @@ DarwinKeyboardReloadHandler(void)
     if (!ok)
         initialKeyRepeatValue = 35;
 
-    keyRepeatValue =
-        CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"),
-                                        CFSTR(".GlobalPreferences"), &ok);
+    keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR(
+                                                         "KeyRepeat"),
+                                                     CFSTR(
+                                                         ".GlobalPreferences"),
+                                                     &ok);
     if (!ok)
         keyRepeatValue = 6;
 
-    pthread_mutex_lock(&keyInfo_mutex); {
+    pthread_mutex_lock(&keyInfo_mutex);
+    {
         /* Initialize our keySyms */
         keySyms.map = keyInfo.keyMap;
         keySyms.mapWidth = GLYPHS_PER_KEY;
@@ -436,43 +431,45 @@ DarwinKeyboardReloadHandler(void)
 
         /* Apply the mappings to the core keyboard */
         for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
-            if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
-                XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
-                                      keySyms.maxKeyCode - keySyms.minKeyCode +
-                                      1, keyInfo.modMap, serverClient);
+            if ((pDev->coreEvents ||
+                 pDev == inputInfo.keyboard) && pDev->key) {
+                XkbApplyMappingChange(
+                    pDev, &keySyms, keySyms.minKeyCode,
+                    keySyms.maxKeyCode -
+                    keySyms.minKeyCode + 1,
+                    keyInfo.modMap, serverClient);
                 DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue,
                                         keyRepeatValue);
             }
         }
-    }
-    pthread_mutex_unlock(&keyInfo_mutex);
+    } pthread_mutex_unlock(&keyInfo_mutex);
 
     /* Modify with xmodmap */
     if (access(xmodmap, F_OK) == 0) {
         /* Check for system .Xmodmap */
         if (access(sysmodmap, F_OK) == 0) {
-            if (snprintf(cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) <
-                sizeof(cmd)) {
+            if (snprintf(cmd, sizeof(cmd), "%s %s", xmodmap,
+                         sysmodmap) < sizeof(cmd)) {
                 X11ApplicationLaunchClient(cmd);
             }
             else {
-                ErrorF
-                    ("X11.app: Unable to create / execute xmodmap command line");
+                ErrorF(
+                    "X11.app: Unable to create / execute xmodmap command line");
             }
         }
 
         /* Check for user's local .Xmodmap */
         if ((homedir != NULL) &&
-            (snprintf(usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) <
-             sizeof(usermodmap))) {
+            (snprintf(usermodmap, sizeof(usermodmap), "%s/.Xmodmap",
+                      homedir) < sizeof(usermodmap))) {
             if (access(usermodmap, F_OK) == 0) {
-                if (snprintf(cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) <
-                    sizeof(cmd)) {
+                if (snprintf(cmd, sizeof(cmd), "%s %s", xmodmap,
+                             usermodmap) < sizeof(cmd)) {
                     X11ApplicationLaunchClient(cmd);
                 }
                 else {
-                    ErrorF
-                        ("X11.app: Unable to create / execute xmodmap command line");
+                    ErrorF(
+                        "X11.app: Unable to create / execute xmodmap command line");
                 }
             }
         }
@@ -502,7 +499,6 @@ int
 DarwinModifierNXKeyToNXKeycode(int key, int side)
 {
     int retval;
-
     pthread_mutex_lock(&keyInfo_mutex);
     retval = keyInfo.modifierKeycodes[key][side];
     pthread_mutex_unlock(&keyInfo_mutex);
@@ -526,8 +522,7 @@ DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
     pthread_mutex_lock(&keyInfo_mutex);
     for (key = 0; key < NX_NUMMODIFIERS; key++) {
         for (side = 0; side <= 1; side++) {
-            if (keyInfo.modifierKeycodes[key][side] == keycode)
-                break;
+            if (keyInfo.modifierKeycodes[key][side] == keycode) break;
         }
     }
     pthread_mutex_unlock(&keyInfo_mutex);
@@ -535,8 +530,7 @@ DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
     if (key == NX_NUMMODIFIERS) {
         return -1;
     }
-    if (outSide)
-        *outSide = side;
+    if (outSide) *outSide = side;
 
     return key;
 }
@@ -551,42 +545,57 @@ DarwinModifierNXMaskToNXKey(int mask)
     switch (mask) {
     case NX_ALPHASHIFTMASK:
         return NX_MODIFIERKEY_ALPHALOCK;
+
     case NX_SHIFTMASK:
         return NX_MODIFIERKEY_SHIFT;
+
 #ifdef NX_DEVICELSHIFTKEYMASK
     case NX_DEVICELSHIFTKEYMASK:
         return NX_MODIFIERKEY_SHIFT;
+
     case NX_DEVICERSHIFTKEYMASK:
         return NX_MODIFIERKEY_RSHIFT;
+
 #endif
     case NX_CONTROLMASK:
         return NX_MODIFIERKEY_CONTROL;
+
 #ifdef NX_DEVICELCTLKEYMASK
     case NX_DEVICELCTLKEYMASK:
         return NX_MODIFIERKEY_CONTROL;
+
     case NX_DEVICERCTLKEYMASK:
         return NX_MODIFIERKEY_RCONTROL;
+
 #endif
     case NX_ALTERNATEMASK:
         return NX_MODIFIERKEY_ALTERNATE;
+
 #ifdef NX_DEVICELALTKEYMASK
     case NX_DEVICELALTKEYMASK:
         return NX_MODIFIERKEY_ALTERNATE;
+
     case NX_DEVICERALTKEYMASK:
         return NX_MODIFIERKEY_RALTERNATE;
+
 #endif
     case NX_COMMANDMASK:
         return NX_MODIFIERKEY_COMMAND;
+
 #ifdef NX_DEVICELCMDKEYMASK
     case NX_DEVICELCMDKEYMASK:
         return NX_MODIFIERKEY_COMMAND;
+
     case NX_DEVICERCMDKEYMASK:
         return NX_MODIFIERKEY_RCOMMAND;
+
 #endif
     case NX_NUMERICPADMASK:
         return NX_MODIFIERKEY_NUMERICPAD;
+
     case NX_HELPMASK:
         return NX_MODIFIERKEY_HELP;
+
     case NX_SECONDARYFNMASK:
         return NX_MODIFIERKEY_SECONDARYFN;
     }
@@ -603,37 +612,52 @@ DarwinModifierNXKeyToNXMask(int key)
     switch (key) {
     case NX_MODIFIERKEY_ALPHALOCK:
         return NX_ALPHASHIFTMASK;
+
 #ifdef NX_DEVICELSHIFTKEYMASK
     case NX_MODIFIERKEY_SHIFT:
         return NX_DEVICELSHIFTKEYMASK;
+
     case NX_MODIFIERKEY_RSHIFT:
         return NX_DEVICERSHIFTKEYMASK;
+
     case NX_MODIFIERKEY_CONTROL:
         return NX_DEVICELCTLKEYMASK;
+
     case NX_MODIFIERKEY_RCONTROL:
         return NX_DEVICERCTLKEYMASK;
+
     case NX_MODIFIERKEY_ALTERNATE:
         return NX_DEVICELALTKEYMASK;
+
     case NX_MODIFIERKEY_RALTERNATE:
         return NX_DEVICERALTKEYMASK;
+
     case NX_MODIFIERKEY_COMMAND:
         return NX_DEVICELCMDKEYMASK;
+
     case NX_MODIFIERKEY_RCOMMAND:
         return NX_DEVICERCMDKEYMASK;
+
 #else
     case NX_MODIFIERKEY_SHIFT:
         return NX_SHIFTMASK;
+
     case NX_MODIFIERKEY_CONTROL:
         return NX_CONTROLMASK;
+
     case NX_MODIFIERKEY_ALTERNATE:
         return NX_ALTERNATEMASK;
+
     case NX_MODIFIERKEY_COMMAND:
         return NX_COMMANDMASK;
+
 #endif
     case NX_MODIFIERKEY_NUMERICPAD:
         return NX_NUMERICPADMASK;
+
     case NX_MODIFIERKEY_HELP:
         return NX_HELPMASK;
+
     case NX_MODIFIERKEY_SECONDARYFN:
         return NX_SECONDARYFNMASK;
     }
@@ -649,80 +673,56 @@ DarwinModifierStringToNXMask(const char *str, int separatelr)
 {
 #ifdef NX_DEVICELSHIFTKEYMASK
     if (separatelr) {
-        if (!strcasecmp(str, "shift"))
-            return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;
-        if (!strcasecmp(str, "control"))
-            return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;
-        if (!strcasecmp(str, "option"))
-            return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "alt"))
-            return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "command"))
-            return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
-        if (!strcasecmp(str, "lshift"))
-            return NX_DEVICELSHIFTKEYMASK;
-        if (!strcasecmp(str, "rshift"))
-            return NX_DEVICERSHIFTKEYMASK;
-        if (!strcasecmp(str, "lcontrol"))
-            return NX_DEVICELCTLKEYMASK;
-        if (!strcasecmp(str, "rcontrol"))
-            return NX_DEVICERCTLKEYMASK;
-        if (!strcasecmp(str, "loption"))
-            return NX_DEVICELALTKEYMASK;
-        if (!strcasecmp(str, "roption"))
-            return NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "lalt"))
-            return NX_DEVICELALTKEYMASK;
-        if (!strcasecmp(str, "ralt"))
-            return NX_DEVICERALTKEYMASK;
-        if (!strcasecmp(str, "lcommand"))
-            return NX_DEVICELCMDKEYMASK;
-        if (!strcasecmp(str, "rcommand"))
-            return NX_DEVICERCMDKEYMASK;
+        if (!strcasecmp(str,
+                        "shift")) return NX_DEVICELSHIFTKEYMASK |
+                   NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str,
+                        "control")) return NX_DEVICELCTLKEYMASK |
+                   NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str,
+                        "option")) return NX_DEVICELALTKEYMASK |
+                   NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str,
+                        "alt")) return NX_DEVICELALTKEYMASK |
+                   NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str,
+                        "command")) return NX_DEVICELCMDKEYMASK |
+                   NX_DEVICERCMDKEYMASK;
+        if (!strcasecmp(str, "lshift")) return NX_DEVICELSHIFTKEYMASK;
+        if (!strcasecmp(str, "rshift")) return NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "lcontrol")) return NX_DEVICELCTLKEYMASK;
+        if (!strcasecmp(str, "rcontrol")) return NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "loption")) return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "roption")) return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lalt")) return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "ralt")) return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lcommand")) return NX_DEVICELCMDKEYMASK;
+        if (!strcasecmp(str, "rcommand")) return NX_DEVICERCMDKEYMASK;
     }
     else {
 #endif
-        if (!strcasecmp(str, "shift"))
-            return NX_SHIFTMASK;
-        if (!strcasecmp(str, "control"))
-            return NX_CONTROLMASK;
-        if (!strcasecmp(str, "option"))
-            return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "alt"))
-            return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "command"))
-            return NX_COMMANDMASK;
-        if (!strcasecmp(str, "lshift"))
-            return NX_SHIFTMASK;
-        if (!strcasecmp(str, "rshift"))
-            return NX_SHIFTMASK;
-        if (!strcasecmp(str, "lcontrol"))
-            return NX_CONTROLMASK;
-        if (!strcasecmp(str, "rcontrol"))
-            return NX_CONTROLMASK;
-        if (!strcasecmp(str, "loption"))
-            return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "roption"))
-            return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "lalt"))
-            return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "ralt"))
-            return NX_ALTERNATEMASK;
-        if (!strcasecmp(str, "lcommand"))
-            return NX_COMMANDMASK;
-        if (!strcasecmp(str, "rcommand"))
-            return NX_COMMANDMASK;
+    if (!strcasecmp(str, "shift")) return NX_SHIFTMASK;
+    if (!strcasecmp(str, "control")) return NX_CONTROLMASK;
+    if (!strcasecmp(str, "option")) return NX_ALTERNATEMASK;
+    if (!strcasecmp(str, "alt")) return NX_ALTERNATEMASK;
+    if (!strcasecmp(str, "command")) return NX_COMMANDMASK;
+    if (!strcasecmp(str, "lshift")) return NX_SHIFTMASK;
+    if (!strcasecmp(str, "rshift")) return NX_SHIFTMASK;
+    if (!strcasecmp(str, "lcontrol")) return NX_CONTROLMASK;
+    if (!strcasecmp(str, "rcontrol")) return NX_CONTROLMASK;
+    if (!strcasecmp(str, "loption")) return NX_ALTERNATEMASK;
+    if (!strcasecmp(str, "roption")) return NX_ALTERNATEMASK;
+    if (!strcasecmp(str, "lalt")) return NX_ALTERNATEMASK;
+    if (!strcasecmp(str, "ralt")) return NX_ALTERNATEMASK;
+    if (!strcasecmp(str, "lcommand")) return NX_COMMANDMASK;
+    if (!strcasecmp(str, "rcommand")) return NX_COMMANDMASK;
 #ifdef NX_DEVICELSHIFTKEYMASK
-    }
+}
 #endif
-    if (!strcasecmp(str, "lock"))
-        return NX_ALPHASHIFTMASK;
-    if (!strcasecmp(str, "fn"))
-        return NX_SECONDARYFNMASK;
-    if (!strcasecmp(str, "help"))
-        return NX_HELPMASK;
-    if (!strcasecmp(str, "numlock"))
-        return NX_NUMERICPADMASK;
+    if (!strcasecmp(str, "lock")) return NX_ALPHASHIFTMASK;
+    if (!strcasecmp(str, "fn")) return NX_SECONDARYFNMASK;
+    if (!strcasecmp(str, "help")) return NX_HELPMASK;
+    if (!strcasecmp(str, "numlock")) return NX_NUMERICPADMASK;
     return 0;
 }
 
@@ -745,28 +745,42 @@ macroman2ucs(unsigned char c)
        first character. */
 
     static const unsigned short table[128] = {
-        0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,
-        0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
-        0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,
-        0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
-        0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,
-        0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,
-        0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,
-        0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,
-        0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,
-        0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,
-        0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,
-        0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,
-        0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,
-        0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
-        0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,
-        0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,
+        0xc4,   0xc5,     0xc7,       0xc9,       0xd1,       0xd6,       0xdc,
+        0xe1,
+        0xe0,   0xe2,     0xe4,     0xe3,     0xe5,   0xe7,     0xe9,
+        0xe8,
+        0xea,   0xeb,     0xed,     0xec,     0xee,   0xef,     0xf1,
+        0xf3,
+        0xf2,   0xf4,     0xf6,     0xf5,     0xfa,   0xf9,     0xfb,
+        0xfc,
+        0x2020, 0xb0,     0xa2,     0xa3,     0xa7,   0x2022,   0xb6,
+        0xdf,
+        0xae,   0xa9,     0x2122,   0xb4,     0xa8,   0x2260,   0xc6,
+        0xd8,
+        0x221e, 0xb1,     0x2264,   0x2265,   0xa5,   0xb5,     0x2202,
+        0x2211,
+        0x220f, 0x3c0,    0x222b,   0xaa,     0xba,   0x3a9,    0xe6,
+        0xf8,
+        0xbf,   0xa1,     0xac,     0x221a,   0x192,  0x2248,   0x2206,
+        0xab,
+        0xbb,   0x2026,   0xa0,     0xc0,     0xc3,   0xd5,     0x152,
+        0x153,
+        0x2013, 0x2014,   0x201c,   0x201d,   0x2018, 0x2019,   0xf7,
+        0x25ca,
+        0xff,   0x178,    0x2044,   0x20ac,   0x2039, 0x203a,   0xfb01,
+        0xfb02,
+        0x2021, 0xb7,     0x201a,   0x201e,   0x2030, 0xc2,     0xca,
+        0xc1,
+        0xcb,   0xc8,     0xcd,     0xce,     0xcf,   0xcc,     0xd3,
+        0xd4,
+        0xf8ff, 0xd2,     0xda,     0xdb,     0xd9,   0x131,    0x2c6,
+        0x2dc,
+        0xaf,   0x2d8,    0x2d9,    0x2da,    0xb8,   0x2dd,    0x2db,
+        0x2c7,
     };
 
-    if (c < 128)
-        return c;
-    else
-        return table[c - 128];
+    if (c < 128) return c;
+    else return table[c - 128];
 }
 
 static KeySym
@@ -775,14 +789,13 @@ make_dead_key(KeySym in)
     int i;
 
     for (i = 0; i < sizeof(dead_keys) / sizeof(dead_keys[0]); i++)
-        if (dead_keys[i].normal == in)
-            return dead_keys[i].dead;
+        if (dead_keys[i].normal == in) return dead_keys[i].dead;
 
     return in;
 }
 
 static Bool
-QuartzReadSystemKeymap(darwinKeyboardInfo * info)
+QuartzReadSystemKeymap(darwinKeyboardInfo *info)
 {
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     KeyboardLayoutRef key_layout;
@@ -801,9 +814,8 @@ QuartzReadSystemKeymap(darwinKeyboardInfo * info)
         TISCopyCurrentKeyboardLayoutInputSource();
 
     if (currentKeyLayoutRef) {
-        currentKeyLayoutDataRef =
-            (CFDataRef) TISGetInputSourceProperty(currentKeyLayoutRef,
-                                                  kTISPropertyUnicodeKeyLayoutData);
+        currentKeyLayoutDataRef = (CFDataRef)TISGetInputSourceProperty(
+            currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
         if (currentKeyLayoutDataRef)
             chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);
     }
@@ -811,18 +823,18 @@ QuartzReadSystemKeymap(darwinKeyboardInfo * info)
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty
 #endif
 
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
     if (chr_data == NULL) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-        ErrorF
-            ("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");
-        ErrorF
-            ("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",
-             (unsigned) keyboard_type, currentKeyLayoutRef,
-             currentKeyLayoutDataRef, chr_data);
+        ErrorF(
+            "X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");
+        ErrorF(
+            "X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",
+            (unsigned)keyboard_type, currentKeyLayoutRef,
+            currentKeyLayoutDataRef, chr_data);
 #endif
 
         KLGetCurrentKeyboardLayout(&key_layout);
@@ -830,25 +842,25 @@ QuartzReadSystemKeymap(darwinKeyboardInfo * info)
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
         if (chr_data != NULL) {
-            ErrorF
-                ("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+            ErrorF(
+                "X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
         }
 #endif
     }
 
     if (chr_data == NULL) {
-        ErrorF
-            ("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");
-        ErrorF
-            ("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");
+        ErrorF(
+            "X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");
+        ErrorF(
+            "If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");
         KLGetKeyboardLayoutProperty(key_layout, kKLKCHRData, &chr_data);
         is_uchr = 0;
         num_keycodes = 128;
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
         if (chr_data != NULL) {
-            ErrorF
-                ("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+            ErrorF(
+                "X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
         }
 #endif
     }
@@ -877,7 +889,8 @@ QuartzReadSystemKeymap(darwinKeyboardInfo * info)
        must be used instead. */
 
     for (i = 0; i < num_keycodes; i++) {
-        static const int mods[4] = { 0, MOD_SHIFT, MOD_OPTION,
+        static const int mods[4] = {
+            0, MOD_SHIFT, MOD_OPTION,
             MOD_OPTION | MOD_SHIFT
         };
 
@@ -887,82 +900,74 @@ QuartzReadSystemKeymap(darwinKeyboardInfo * info)
 #if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
             if (is_uchr) {
 #endif
-                UniChar s[8];
-                UniCharCount len;
-                UInt32 dead_key_state = 0, extra_dead = 0;
-
+            UniChar s[8];
+            UniCharCount len;
+            UInt32 dead_key_state = 0, extra_dead = 0;
+
+            err = UCKeyTranslate(chr_data, i, kUCKeyActionDown,
+                                 mods[j] >> 8, keyboard_type, 0,
+                                 &dead_key_state, 8, &len, s);
+            if (err != noErr) continue;
+
+            if (len == 0 && dead_key_state != 0) {
+                /* Found a dead key. Work out which one it is, but
+                   remembering that it's dead. */
                 err = UCKeyTranslate(chr_data, i, kUCKeyActionDown,
-                                     mods[j] >> 8, keyboard_type, 0,
-                                     &dead_key_state, 8, &len, s);
-                if (err != noErr)
-                    continue;
-
-                if (len == 0 && dead_key_state != 0) {
-                    /* Found a dead key. Work out which one it is, but
-                       remembering that it's dead. */
-                    err = UCKeyTranslate(chr_data, i, kUCKeyActionDown,
-                                         mods[j] >> 8, keyboard_type,
-                                         kUCKeyTranslateNoDeadKeysMask,
-                                         &extra_dead, 8, &len, s);
-                    if (err != noErr)
-                        continue;
-                }
+                                     mods[j] >> 8, keyboard_type,
+                                     kUCKeyTranslateNoDeadKeysMask,
+                                     &extra_dead, 8, &len, s);
+                if (err != noErr) continue;
+            }
 
-                /* Not sure why 0x0010 is there.
-                 * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
-                 */
-                if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
-                    k[j] = ucs2keysym(s[0]);
-                    if (dead_key_state != 0)
-                        k[j] = make_dead_key(k[j]);
-                }
-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+            /* Not sure why 0x0010 is there.
+             * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
+             */
+            if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
+                k[j] = ucs2keysym(s[0]);
+                if (dead_key_state != 0) k[j] = make_dead_key(k[j]);
             }
-            else {              // kchr
-                UInt32 c, state = 0, state2 = 0;
-                UInt16 code;
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+        }
+        else {       // kchr
+            UInt32 c, state = 0, state2 = 0;
+            UInt16 code;
 
-                code = i | mods[j];
+            code = i | mods[j];
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"    // KeyTranslate
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KeyTranslate
 #endif
 
-                c = KeyTranslate(chr_data, code, &state);
+            c = KeyTranslate(chr_data, code, &state);
 
-                /* Dead keys are only processed on key-down, so ask
-                   to translate those events. When we find a dead key,
-                   translating the matching key up event will give
-                   us the actual dead character. */
+            /* Dead keys are only processed on key-down, so ask
+               to translate those events. When we find a dead key,
+               translating the matching key up event will give
+               us the actual dead character. */
 
-                if (state != 0)
-                    c = KeyTranslate(chr_data, code | 128, &state2);
+            if (state != 0)
+                c = KeyTranslate(chr_data, code | 128, &state2);
 
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
-                /* Characters seem to be in MacRoman encoding. */
+            /* Characters seem to be in MacRoman encoding. */
 
-                if (c != 0 && c != 0x0010) {
-                    k[j] = ucs2keysym(macroman2ucs(c & 255));
+            if (c != 0 && c != 0x0010) {
+                k[j] = ucs2keysym(macroman2ucs(c & 255));
 
-                    if (state != 0)
-                        k[j] = make_dead_key(k[j]);
-                }
+                if (state != 0) k[j] = make_dead_key(k[j]);
             }
+        }
 #endif
         }
 
-        if (k[3] == k[2])
-            k[3] = NoSymbol;
-        if (k[1] == k[0])
-            k[1] = NoSymbol;
-        if (k[0] == k[2] && k[1] == k[3])
-            k[2] = k[3] = NoSymbol;
-        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol)
-            k[3] = NoSymbol;
+        if (k[3] == k[2]) k[3] = NoSymbol;
+        if (k[1] == k[0]) k[1] = NoSymbol;
+        if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
+        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
     }
 
 #if HACK_MISSING
@@ -1006,7 +1011,6 @@ Bool
 QuartsResyncKeymap(Bool sendDDXEvent)
 {
     Bool retval;
-
     /* Update keyInfo */
     pthread_mutex_lock(&keyInfo_mutex);
     memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.h b/xorg-server/hw/xquartz/quartzKeyboard.h
index de4aed868..60290e658 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.h
+++ b/xorg-server/hw/xquartz/quartzKeyboard.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2002-2012 Apple Inc. All rights reserved.
  * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,30 +28,38 @@
 #ifndef QUARTZ_KEYBOARD_H
 #define QUARTZ_KEYBOARD_H 1
 
-#define XK_TECHNICAL		// needed to get XK_Escape
+#define XK_TECHNICAL      // needed to get XK_Escape
 #define XK_PUBLISHING
 #include "X11/keysym.h"
 #include "inputstr.h"
 
 // Each key can generate 4 glyphs. They are, in order:
 // unshifted, shifted, modeswitch unshifted, modeswitch shifted
-#define GLYPHS_PER_KEY  4
-#define NUM_KEYCODES    248	// NX_NUMKEYCODES might be better
-#define MIN_KEYCODE     XkbMinLegalKeyCode     // unfortunately, this isn't 0...
-#define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
+#define GLYPHS_PER_KEY 4
+#define NUM_KEYCODES   248      // NX_NUMKEYCODES might be better
+#define MIN_KEYCODE    XkbMinLegalKeyCode      // unfortunately, this isn't 0...
+#define MAX_KEYCODE    NUM_KEYCODES + MIN_KEYCODE - 1
 
 /* These functions need to be implemented by Xquartz, XDarwin, etc. */
-Bool QuartsResyncKeymap(Bool sendDDXEvent);
+Bool
+QuartsResyncKeymap(Bool sendDDXEvent);
 
 /* Provided for darwinEvents.c */
-void DarwinKeyboardReloadHandler(void);
-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
-int DarwinModifierNXKeyToNXKeycode(int key, int side);
-int DarwinModifierNXKeyToNXMask(int key);
-int DarwinModifierNXMaskToNXKey(int mask);
-int DarwinModifierStringToNXMask(const char *string, int separatelr);
+void
+DarwinKeyboardReloadHandler(void);
+int
+DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
+int
+DarwinModifierNXKeyToNXKeycode(int key, int side);
+int
+DarwinModifierNXKeyToNXMask(int key);
+int
+DarwinModifierNXMaskToNXKey(int mask);
+int
+DarwinModifierStringToNXMask(const char *string, int separatelr);
 
 /* Provided for darwin.c */
-void DarwinKeyboardInit(DeviceIntPtr pDev);
+void
+DarwinKeyboardInit(DeviceIntPtr pDev);
 
 #endif /* QUARTZ_KEYBOARD_H */
diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index b7c424f50..cb470fa8e 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons,
  *               2010      Jan Hauffa.
- *               2010-2011 Apple Inc.
+ *               2010-2012 Apple Inc.
  *                 All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -53,18 +53,18 @@
  */
 static Bool ignore_next_fake_mode_update = FALSE;
 
-#define FAKE_REFRESH_ROOTLESS 1
+#define FAKE_REFRESH_ROOTLESS   1
 #define FAKE_REFRESH_FULLSCREEN 2
 
-#define DEFAULT_REFRESH  60
-#define kDisplayModeUsableFlags  (kDisplayModeValidFlag | kDisplayModeSafeFlag)
+#define DEFAULT_REFRESH         60
+#define kDisplayModeUsableFlags (kDisplayModeValidFlag | kDisplayModeSafeFlag)
 
-#define CALLBACK_SUCCESS 0
-#define CALLBACK_CONTINUE 1
-#define CALLBACK_ERROR -1
+#define CALLBACK_SUCCESS        0
+#define CALLBACK_CONTINUE       1
+#define CALLBACK_ERROR          -1
 
 typedef int (*QuartzModeCallback)
- (ScreenPtr, QuartzModeInfoPtr, void *);
+    (ScreenPtr, QuartzModeInfoPtr, void *);
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
 
@@ -73,8 +73,7 @@ getDictLong(CFDictionaryRef dictRef, CFStringRef key)
 {
     long value;
 
-    CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);
-
+    CFNumberRef numRef = (CFNumberRef)CFDictionaryGetValue(dictRef, key);
     if (!numRef)
         return 0;
 
@@ -88,8 +87,7 @@ getDictDouble(CFDictionaryRef dictRef, CFStringRef key)
 {
     double value;
 
-    CFNumberRef numRef = (CFNumberRef) CFDictionaryGetValue(dictRef, key);
-
+    CFNumberRef numRef = (CFNumberRef)CFDictionaryGetValue(dictRef, key);
     if (!numRef)
         return 0.0;
 
@@ -99,12 +97,13 @@ getDictDouble(CFDictionaryRef dictRef, CFStringRef key)
 }
 
 static void
-QuartzRandRGetModeInfo(CFDictionaryRef modeRef, QuartzModeInfoPtr pMode)
+QuartzRandRGetModeInfo(CFDictionaryRef modeRef,
+                       QuartzModeInfoPtr pMode)
 {
-    pMode->width = (size_t) getDictLong(modeRef, kCGDisplayWidth);
-    pMode->height = (size_t) getDictLong(modeRef, kCGDisplayHeight);
+    pMode->width = (size_t)getDictLong(modeRef, kCGDisplayWidth);
+    pMode->height = (size_t)getDictLong(modeRef, kCGDisplayHeight);
     pMode->refresh =
-        (int) (getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5);
+        (int)(getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5);
     if (pMode->refresh == 0)
         pMode->refresh = DEFAULT_REFRESH;
     pMode->ref = NULL;
@@ -116,27 +115,27 @@ QuartzRandRCopyCurrentModeInfo(CGDirectDisplayID screenId,
                                QuartzModeInfoPtr pMode)
 {
     CFDictionaryRef curModeRef = CGDisplayCurrentMode(screenId);
-
     if (!curModeRef)
         return FALSE;
 
     QuartzRandRGetModeInfo(curModeRef, pMode);
-    pMode->ref = (void *) curModeRef;
+    pMode->ref = (void *)curModeRef;
     CFRetain(pMode->ref);
     return TRUE;
 }
 
 static Bool
-QuartzRandRSetCGMode(CGDirectDisplayID screenId, QuartzModeInfoPtr pMode)
+QuartzRandRSetCGMode(CGDirectDisplayID screenId,
+                     QuartzModeInfoPtr pMode)
 {
-    CFDictionaryRef modeRef = (CFDictionaryRef) pMode->ref;
-
+    CFDictionaryRef modeRef = (CFDictionaryRef)pMode->ref;
     return (CGDisplaySwitchToMode(screenId, modeRef) == kCGErrorSuccess);
 }
 
 static Bool
 QuartzRandREnumerateModes(ScreenPtr pScreen,
-                          QuartzModeCallback callback, void *data)
+                          QuartzModeCallback callback,
+                          void *data)
 {
     Bool retval = FALSE;
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
@@ -160,19 +159,18 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
             return FALSE;
         for (i = 0; i < CFArrayGetCount(modes); i++) {
             int cb;
-
-            modeRef = (CFDictionaryRef) CFArrayGetValueAtIndex(modes, i);
+            modeRef = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i);
 
             /* Skip modes that are not usable on the current display or have a
                different pixel encoding than the current mode. */
-            if (((unsigned long) getDictLong(modeRef, kCGDisplayIOFlags) &
+            if (((unsigned long)getDictLong(modeRef, kCGDisplayIOFlags) &
                  kDisplayModeUsableFlags) != kDisplayModeUsableFlags)
                 continue;
             if (getDictLong(modeRef, kCGDisplayBitsPerPixel) != curBpp)
                 continue;
 
             QuartzRandRGetModeInfo(modeRef, &modeInfo);
-            modeInfo.ref = (void *) modeRef;
+            modeInfo.ref = (void *)modeRef;
             cb = callback(pScreen, &modeInfo, data);
             if (cb == CALLBACK_CONTINUE)
                 retval = TRUE;
@@ -186,10 +184,13 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
     switch (callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
     case CALLBACK_SUCCESS:
         return TRUE;
+
     case CALLBACK_ERROR:
         return FALSE;
+
     case CALLBACK_CONTINUE:
         retval = TRUE;
+
     default:
         break;
     }
@@ -197,10 +198,13 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
     switch (callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
     case CALLBACK_SUCCESS:
         return TRUE;
+
     case CALLBACK_ERROR:
         return FALSE;
+
     case CALLBACK_CONTINUE:
         retval = TRUE;
+
     default:
         break;
     }
@@ -208,14 +212,15 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
     return retval;
 }
 
-#else                           /* we have the new CG APIs from Snow Leopard */
+#else /* we have the new CG APIs from Snow Leopard */
 
 static void
-QuartzRandRGetModeInfo(CGDisplayModeRef modeRef, QuartzModeInfoPtr pMode)
+QuartzRandRGetModeInfo(CGDisplayModeRef modeRef,
+                       QuartzModeInfoPtr pMode)
 {
     pMode->width = CGDisplayModeGetWidth(modeRef);
     pMode->height = CGDisplayModeGetHeight(modeRef);
-    pMode->refresh = (int) (CGDisplayModeGetRefreshRate(modeRef) + 0.5);
+    pMode->refresh = (int)(CGDisplayModeGetRefreshRate(modeRef) + 0.5);
     if (pMode->refresh == 0)
         pMode->refresh = DEFAULT_REFRESH;
     pMode->ref = NULL;
@@ -227,7 +232,6 @@ QuartzRandRCopyCurrentModeInfo(CGDirectDisplayID screenId,
                                QuartzModeInfoPtr pMode)
 {
     CGDisplayModeRef curModeRef = CGDisplayCopyDisplayMode(screenId);
-
     if (!curModeRef)
         return FALSE;
 
@@ -237,20 +241,21 @@ QuartzRandRCopyCurrentModeInfo(CGDirectDisplayID screenId,
 }
 
 static Bool
-QuartzRandRSetCGMode(CGDirectDisplayID screenId, QuartzModeInfoPtr pMode)
+QuartzRandRSetCGMode(CGDirectDisplayID screenId,
+                     QuartzModeInfoPtr pMode)
 {
-    CGDisplayModeRef modeRef = (CGDisplayModeRef) pMode->ref;
-
+    CGDisplayModeRef modeRef = (CGDisplayModeRef)pMode->ref;
     if (!modeRef)
         return FALSE;
 
-    return (CGDisplaySetDisplayMode(screenId, modeRef, NULL) ==
-            kCGErrorSuccess);
+    return (CGDisplaySetDisplayMode(screenId, modeRef,
+                                    NULL) == kCGErrorSuccess);
 }
 
 static Bool
 QuartzRandREnumerateModes(ScreenPtr pScreen,
-                          QuartzModeCallback callback, void *data)
+                          QuartzModeCallback callback,
+                          void *data)
 {
     Bool retval = FALSE;
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
@@ -278,12 +283,12 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
         }
         for (i = 0; i < CFArrayGetCount(modes); i++) {
             int cb;
-
-            modeRef = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i);
+            modeRef = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i);
 
             /* Skip modes that are not usable on the current display or have a
                different pixel encoding than the current mode. */
-            if ((CGDisplayModeGetIOFlags(modeRef) & kDisplayModeUsableFlags) !=
+            if ((CGDisplayModeGetIOFlags(modeRef) &
+                 kDisplayModeUsableFlags) !=
                 kDisplayModeUsableFlags)
                 continue;
             pixelEnc = CGDisplayModeCopyPixelEncoding(modeRef);
@@ -317,10 +322,13 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
     switch (callback(pScreen, &pQuartzScreen->rootlessMode, data)) {
     case CALLBACK_SUCCESS:
         return TRUE;
+
     case CALLBACK_ERROR:
         return FALSE;
+
     case CALLBACK_CONTINUE:
         retval = TRUE;
+
     default:
         break;
     }
@@ -328,10 +336,13 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
     switch (callback(pScreen, &pQuartzScreen->fullscreenMode, data)) {
     case CALLBACK_SUCCESS:
         return TRUE;
+
     case CALLBACK_ERROR:
         return FALSE;
+
     case CALLBACK_CONTINUE:
         retval = TRUE;
+
     default:
         break;
     }
@@ -339,22 +350,24 @@ QuartzRandREnumerateModes(ScreenPtr pScreen,
     return retval;
 }
 
-#endif                          /* Snow Leopard CoreGraphics APIs */
+#endif  /* Snow Leopard CoreGraphics APIs */
 
 static Bool
-QuartzRandRModesEqual(QuartzModeInfoPtr pMode1, QuartzModeInfoPtr pMode2)
+QuartzRandRModesEqual(QuartzModeInfoPtr pMode1,
+                      QuartzModeInfoPtr pMode2)
 {
     return (pMode1->width == pMode2->width) &&
-        (pMode1->height == pMode2->height) &&
-        (pMode1->refresh == pMode2->refresh);
+           (pMode1->height == pMode2->height) &&
+           (pMode1->refresh == pMode2->refresh);
 }
 
 static Bool
-QuartzRandRRegisterMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode)
+QuartzRandRRegisterMode(ScreenPtr pScreen,
+                        QuartzModeInfoPtr pMode)
 {
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
-    Bool isCurrentMode =
-        QuartzRandRModesEqual(&pQuartzScreen->currentMode, pMode);
+    Bool isCurrentMode = QuartzRandRModesEqual(&pQuartzScreen->currentMode,
+                                               pMode);
 
     /* TODO: DPI */
     pMode->pSize =
@@ -375,7 +388,8 @@ QuartzRandRRegisterMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode)
 
 static int
 QuartzRandRRegisterModeCallback(ScreenPtr pScreen,
-                                QuartzModeInfoPtr pMode, void *data __unused)
+                                QuartzModeInfoPtr pMode,
+                                void *data __unused)
 {
     if (QuartzRandRRegisterMode(pScreen, pMode)) {
         return CALLBACK_CONTINUE;
@@ -386,11 +400,13 @@ QuartzRandRRegisterModeCallback(ScreenPtr pScreen,
 }
 
 static Bool
-QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister)
+QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode,
+                   BOOL doRegister)
 {
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
-    Bool captureDisplay = (pMode->refresh != FAKE_REFRESH_FULLSCREEN &&
-                           pMode->refresh != FAKE_REFRESH_ROOTLESS);
+    Bool captureDisplay =
+        (pMode->refresh != FAKE_REFRESH_FULLSCREEN && pMode->refresh !=
+    FAKE_REFRESH_ROOTLESS);
     CGDirectDisplayID screenId;
 
     if (pQuartzScreen->displayIDs == NULL)
@@ -442,15 +458,16 @@ QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister)
 
 static int
 QuartzRandRSetModeCallback(ScreenPtr pScreen,
-                           QuartzModeInfoPtr pMode, void *data)
+                           QuartzModeInfoPtr pMode,
+                           void *data)
 {
-    QuartzModeInfoPtr pReqMode = (QuartzModeInfoPtr) data;
+    QuartzModeInfoPtr pReqMode = (QuartzModeInfoPtr)data;
 
     if (!QuartzRandRModesEqual(pMode, pReqMode))
-        return CALLBACK_CONTINUE;       /* continue enumeration */
+        return CALLBACK_CONTINUE;  /* continue enumeration */
 
     DEBUG_LOG("Found a match for requested RandR resolution (%dx%d@%d).\n",
-              (int) pMode->width, (int) pMode->height, (int) pMode->refresh);
+              (int)pMode->width, (int)pMode->height, (int)pMode->refresh);
 
     if (QuartzRandRSetMode(pScreen, pMode, FALSE))
         return CALLBACK_SUCCESS;
@@ -459,9 +476,9 @@ QuartzRandRSetModeCallback(ScreenPtr pScreen,
 }
 
 static Bool
-QuartzRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
+QuartzRandRGetInfo(ScreenPtr pScreen, Rotation *rotations)
 {
-    *rotations = RR_Rotate_0;   /* TODO: support rotation */
+    *rotations = RR_Rotate_0;  /* TODO: support rotation */
 
     return QuartzRandREnumerateModes(pScreen, QuartzRandRRegisterModeCallback,
                                      NULL);
@@ -469,7 +486,9 @@ QuartzRandRGetInfo(ScreenPtr pScreen, Rotation * rotations)
 
 static Bool
 QuartzRandRSetConfig(ScreenPtr pScreen,
-                     Rotation randr, int rate, RRScreenSizePtr pSize)
+                     Rotation randr,
+                     int rate,
+                     RRScreenSizePtr pSize)
 {
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
     QuartzModeInfo reqMode;
@@ -482,13 +501,14 @@ QuartzRandRSetConfig(ScreenPtr pScreen,
     if (QuartzRandRModesEqual(&reqMode, &pQuartzScreen->currentMode))
         return TRUE;
 
-    if (QuartzRandREnumerateModes
-        (pScreen, QuartzRandRSetModeCallback, &reqMode)) {
+    if (QuartzRandREnumerateModes(pScreen, QuartzRandRSetModeCallback,
+                                  &reqMode)) {
         return TRUE;
     }
 
     DEBUG_LOG("Unable to find a matching config: %d x %d @ %d\n",
-              (int) reqMode.width, (int) reqMode.height, (int) reqMode.refresh);
+              (int)reqMode.width, (int)reqMode.height,
+              (int)reqMode.refresh);
     return FALSE;
 }
 
@@ -499,8 +519,8 @@ _QuartzRandRUpdateFakeModes(ScreenPtr pScreen)
     QuartzModeInfo activeMode;
 
     if (pQuartzScreen->displayCount > 0) {
-        if (!QuartzRandRCopyCurrentModeInfo
-            (pQuartzScreen->displayIDs[0], &activeMode)) {
+        if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],
+                                            &activeMode)) {
             ErrorF("Unable to determine current display mode.\n");
             return FALSE;
         }
@@ -545,13 +565,13 @@ _QuartzRandRUpdateFakeModes(ScreenPtr pScreen)
         CFRetain(pQuartzScreen->currentMode.ref);
 
     DEBUG_LOG("rootlessMode: %d x %d\n",
-              (int) pQuartzScreen->rootlessMode.width,
-              (int) pQuartzScreen->rootlessMode.height);
+              (int)pQuartzScreen->rootlessMode.width,
+              (int)pQuartzScreen->rootlessMode.height);
     DEBUG_LOG("fullscreenMode: %d x %d\n",
-              (int) pQuartzScreen->fullscreenMode.width,
-              (int) pQuartzScreen->fullscreenMode.height);
-    DEBUG_LOG("currentMode: %d x %d\n", (int) pQuartzScreen->currentMode.width,
-              (int) pQuartzScreen->currentMode.height);
+              (int)pQuartzScreen->fullscreenMode.width,
+              (int)pQuartzScreen->fullscreenMode.height);
+    DEBUG_LOG("currentMode: %d x %d\n", (int)pQuartzScreen->currentMode.width,
+              (int)pQuartzScreen->currentMode.height);
 
     return TRUE;
 }
@@ -562,8 +582,8 @@ QuartzRandRUpdateFakeModes(BOOL force_update)
     ScreenPtr pScreen = screenInfo.screens[0];
 
     if (ignore_next_fake_mode_update) {
-        DEBUG_LOG
-            ("Ignoring update request caused by RandR resolution change.\n");
+        DEBUG_LOG(
+            "Ignoring update request caused by RandR resolution change.\n");
         ignore_next_fake_mode_update = FALSE;
         return TRUE;
     }
@@ -582,10 +602,8 @@ QuartzRandRInit(ScreenPtr pScreen)
 {
     rrScrPrivPtr pScrPriv;
 
-    if (!RRScreenInit(pScreen))
-        return FALSE;
-    if (!_QuartzRandRUpdateFakeModes(pScreen))
-        return FALSE;
+    if (!RRScreenInit(pScreen)) return FALSE;
+    if (!_QuartzRandRUpdateFakeModes(pScreen)) return FALSE;
 
     pScrPriv = rrGetScrPriv(pScreen);
     pScrPriv->rrGetInfo = QuartzRandRGetInfo;
@@ -637,12 +655,12 @@ QuartzRandRToggleFullscreen(void)
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
 
     if (pQuartzScreen->currentMode.ref == NULL) {
-        ErrorF
-            ("Ignoring QuartzRandRToggleFullscreen because don't have a current mode set.\n");
+        ErrorF(
+            "Ignoring QuartzRandRToggleFullscreen because don't have a current mode set.\n");
     }
     else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_ROOTLESS) {
-        ErrorF
-            ("Ignoring QuartzRandRToggleFullscreen because we are in rootless mode.\n");
+        ErrorF(
+            "Ignoring QuartzRandRToggleFullscreen because we are in rootless mode.\n");
     }
     else if (pQuartzScreen->currentMode.refresh == FAKE_REFRESH_FULLSCREEN) {
         /* Legacy fullscreen mode.  Hide/Show */
diff --git a/xorg-server/hw/xquartz/quartzRandR.h b/xorg-server/hw/xquartz/quartzRandR.h
index ce7f055d1..006fc4d44 100644
--- a/xorg-server/hw/xquartz/quartzRandR.h
+++ b/xorg-server/hw/xquartz/quartzRandR.h
@@ -1,80 +1,85 @@
-/*

- * quartzRandR.h

- *

- * Copyright (c) 2010 Jan Hauffa.

- *               2010 Apple 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _QUARTZRANDR_H_

-#define _QUARTZRANDR_H_

-

-#include "randrstr.h"

-

-typedef struct {

-    size_t width, height;

-    int refresh;

-    RRScreenSizePtr pSize;

-    void *ref; /* CGDisplayModeRef or CFDictionaryRef */

-} QuartzModeInfo, *QuartzModeInfoPtr;

-

-// Quartz specific per screen storage structure

-typedef struct {

-    // List of CoreGraphics displays that this X11 screen covers.

-    // This is more than one CG display for video mirroring and

-    // rootless PseudoramiX mode.

-    // No CG display will be covered by more than one X11 screen.

-    int displayCount;

-    CGDirectDisplayID *displayIDs;

-    QuartzModeInfo rootlessMode, fullscreenMode, currentMode;

-} QuartzScreenRec, *QuartzScreenPtr;

-

-#define QUARTZ_PRIV(pScreen) \

-    ((QuartzScreenPtr)dixLookupPrivate(&pScreen->devPrivates, quartzScreenKey))

-

-void QuartzCopyDisplayIDs(ScreenPtr pScreen,

-                          int displayCount, CGDirectDisplayID *displayIDs);

-

-Bool QuartzRandRUpdateFakeModes (BOOL force_update);

-Bool QuartzRandRInit (ScreenPtr pScreen);

-

-/* These two functions provide functionality expected by the legacy

- * mode switching.  They are equivalent to a client requesting one

- * of the modes corresponding to these "fake" modes.

- * QuartzRandRSetFakeFullscreen takes an argument which is used to determine

- * the visibility of the windows after the change.

- */

-void QuartzRandRSetFakeRootless (void);

-void QuartzRandRSetFakeFullscreen (BOOL state);

-

-

-/* Toggle fullscreen mode.  If "fake" fullscreen is the current mode,

- * this will just show/hide the X11 windows.  If we are in a RandR fullscreen

- * mode, this will toggles us to the default fake mode and hide windows if

- * it is fullscreen

- */

-void QuartzRandRToggleFullscreen (void);

-

-#endif

+/*
+ * quartzRandR.h
+ *
+ * Copyright (c) 2010 Jan Hauffa.
+ *               2010-2012 Apple 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 ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _QUARTZRANDR_H_
+#define _QUARTZRANDR_H_
+
+#include "randrstr.h"
+
+typedef struct {
+    size_t width, height;
+    int refresh;
+    RRScreenSizePtr pSize;
+    void *ref; /* CGDisplayModeRef or CFDictionaryRef */
+} QuartzModeInfo, *QuartzModeInfoPtr;
+
+// Quartz specific per screen storage structure
+typedef struct {
+    // List of CoreGraphics displays that this X11 screen covers.
+    // This is more than one CG display for video mirroring and
+    // rootless PseudoramiX mode.
+    // No CG display will be covered by more than one X11 screen.
+    int displayCount;
+    CGDirectDisplayID *displayIDs;
+    QuartzModeInfo rootlessMode, fullscreenMode, currentMode;
+} QuartzScreenRec, *QuartzScreenPtr;
+
+#define QUARTZ_PRIV(pScreen) \
+    ((QuartzScreenPtr)dixLookupPrivate(&pScreen->devPrivates, quartzScreenKey))
+
+void
+QuartzCopyDisplayIDs(ScreenPtr pScreen, int displayCount,
+                     CGDirectDisplayID *displayIDs);
+
+Bool
+QuartzRandRUpdateFakeModes(BOOL force_update);
+Bool
+QuartzRandRInit(ScreenPtr pScreen);
+
+/* These two functions provide functionality expected by the legacy
+ * mode switching.  They are equivalent to a client requesting one
+ * of the modes corresponding to these "fake" modes.
+ * QuartzRandRSetFakeFullscreen takes an argument which is used to determine
+ * the visibility of the windows after the change.
+ */
+void
+QuartzRandRSetFakeRootless(void);
+void
+QuartzRandRSetFakeFullscreen(BOOL state);
+
+/* Toggle fullscreen mode.  If "fake" fullscreen is the current mode,
+ * this will just show/hide the X11 windows.  If we are in a RandR fullscreen
+ * mode, this will toggles us to the default fake mode and hide windows if
+ * it is fullscreen
+ */
+void
+QuartzRandRToggleFullscreen(void);
+
+#endif
diff --git a/xorg-server/hw/xquartz/quartzStartup.c b/xorg-server/hw/xquartz/quartzStartup.c
index 183bf7618..4dc4dd630 100644
--- a/xorg-server/hw/xquartz/quartzStartup.c
+++ b/xorg-server/hw/xquartz/quartzStartup.c
@@ -1,7 +1,7 @@
 /**************************************************************
  *
  * Startup code for the Quartz Darwin X Server
- *
+ * Copyright (c) 2008-2012 Apple Inc. All rights reserved.
  * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -48,7 +48,8 @@
 
 #include <pthread.h>
 
-int dix_main(int argc, char **argv, char **envp);
+int
+dix_main(int argc, char **argv, char **envp);
 
 struct arg {
     int argc;
@@ -56,11 +57,11 @@ struct arg {
     char **envp;
 };
 
-_X_NORETURN static void
+_X_NORETURN
+static void
 server_thread(void *arg)
 {
-    struct arg args = *((struct arg *) arg);
-
+    struct arg args = *((struct arg *)arg);
     free(arg);
     exit(dix_main(args.argc, args.argv, args.envp));
 }
@@ -83,8 +84,7 @@ create_thread(void *func, void *arg)
 void
 QuartzInitServer(int argc, char **argv, char **envp)
 {
-    struct arg *args = (struct arg *) malloc(sizeof(struct arg));
-
+    struct arg *args = (struct arg *)malloc(sizeof(struct arg));
     if (!args)
         FatalError("Could not allocate memory.\n");
 
@@ -117,7 +117,8 @@ server_main(int argc, char **argv, char **envp)
 
     for (i = 1; i < argc; i++) {
         // Display version info without starting Mac OS X UI if requested
-        if (!strcmp(argv[i], "-showconfig") || !strcmp(argv[i], "-version")) {
+        if (!strcmp(argv[i],
+                    "-showconfig") || !strcmp(argv[i], "-version")) {
             DarwinPrintBanner();
             exit(0);
         }
diff --git a/xorg-server/hw/xquartz/xpr/appledri.c b/xorg-server/hw/xquartz/xpr/appledri.c
index 4ef0061b2..1bb837958 100644
--- a/xorg-server/hw/xquartz/xpr/appledri.c
+++ b/xorg-server/hw/xquartz/xpr/appledri.c
@@ -1,29 +1,29 @@
 /**************************************************************************
 
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2009-2011 Apple Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+   Copyright 2000 VA Linux Systems, Inc.
+   Copyright (c) 2002, 2009-2012 Apple Inc.
+   All Rights Reserved.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sub license, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice (including the
+   next paragraph) shall be included in all copies or substantial portions
+   of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+   IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+   ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
@@ -32,6 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Kevin E. Martin <martin@valinux.com>
  *   Jens Owen <jens@valinux.com>
  *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *   Jeremy Huddleston <jeremyhu@apple.com>
  *
  */
 
@@ -59,14 +60,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 static int DRIErrorBase = 0;
 
-static void AppleDRIResetProc(ExtensionEntry * extEntry);
-static int ProcAppleDRICreatePixmap(ClientPtr client);
+static void
+AppleDRIResetProc(ExtensionEntry* extEntry);
+static int
+ProcAppleDRICreatePixmap(ClientPtr client);
 
 static unsigned char DRIReqCode = 0;
 static int DRIEventBase = 0;
 
-static void SNotifyEvent(xAppleDRINotifyEvent * from,
-                         xAppleDRINotifyEvent * to);
+static void
+SNotifyEvent(xAppleDRINotifyEvent *from, xAppleDRINotifyEvent *to);
 
 typedef struct _DRIEvent *DRIEventPtr;
 typedef struct _DRIEvent {
@@ -76,8 +79,9 @@ typedef struct _DRIEvent {
     unsigned int mask;
 } DRIEventRec;
 
- /*ARGSUSED*/ static void
-AppleDRIResetProc(ExtensionEntry * extEntry)
+/*ARGSUSED*/
+static void
+AppleDRIResetProc(ExtensionEntry* extEntry)
 {
     DRIReset();
 }
@@ -101,7 +105,7 @@ ProcAppleDRIQueryVersion(register ClientPtr client)
         swaps(&rep.minorVersion);
         swapl(&rep.patchVersion);
     }
-    WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *) &rep);
+    WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *)&rep);
     return Success;
 }
 
@@ -135,7 +139,7 @@ ProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client)
 
     WriteToClient(client,
                   sizeof(xAppleDRIQueryDirectRenderingCapableReply),
-                  (char *) &rep);
+                  (char *)&rep);
     return Success;
 }
 
@@ -152,26 +156,28 @@ ProcAppleDRIAuthConnection(register ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.authenticated = 1;
 
-    if (!DRIAuthConnection(screenInfo.screens[stuff->screen], stuff->magic)) {
-        ErrorF("Failed to authenticate %u\n", (unsigned int) stuff->magic);
+    if (!DRIAuthConnection(screenInfo.screens[stuff->screen],
+                           stuff->magic)) {
+        ErrorF("Failed to authenticate %u\n", (unsigned int)stuff->magic);
         rep.authenticated = 0;
     }
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
-        swapl(&rep.authenticated);      /* Yes, this is a CARD32 ... sigh */
+        swapl(&rep.authenticated); /* Yes, this is a CARD32 ... sigh */
     }
 
-    WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *) &rep);
+    WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep);
     return Success;
 }
 
 static void
-surface_notify(void *_arg, void *data)
+surface_notify(void *_arg,
+               void *data)
 {
     DRISurfaceNotifyArg *arg = _arg;
-    int client_index = (int) x_cvt_vptr_to_uint(data);
+    int client_index = (int)x_cvt_vptr_to_uint(data);
     xAppleDRINotifyEvent se;
 
     if (client_index < 0 || client_index >= currentMaxClients)
@@ -181,7 +187,7 @@ surface_notify(void *_arg, void *data)
     se.kind = arg->kind;
     se.arg = arg->id;
     se.time = currentTime.milliseconds;
-    WriteEventsToClient(clients[client_index], 1, (xEvent *) &se);
+    WriteEventsToClient(clients[client_index], 1, (xEvent *)&se);
 }
 
 static int
@@ -207,9 +213,10 @@ ProcAppleDRICreateSurface(ClientPtr client)
     rep.key_0 = rep.key_1 = rep.uid = 0;
 
     if (!DRICreateSurface(screenInfo.screens[stuff->screen],
-                          (Drawable) stuff->drawable, pDrawable,
+                          (Drawable)stuff->drawable, pDrawable,
                           stuff->client_id, &sid, key,
-                          surface_notify, x_cvt_uint_to_vptr(client->index))) {
+                          surface_notify,
+                          x_cvt_uint_to_vptr(client->index))) {
         return BadValue;
     }
 
@@ -225,7 +232,7 @@ ProcAppleDRICreateSurface(ClientPtr client)
         swapl(&rep.uid);
     }
 
-    WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *) &rep);
+    WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *)&rep);
     return Success;
 }
 
@@ -233,10 +240,8 @@ static int
 ProcAppleDRIDestroySurface(register ClientPtr client)
 {
     int rc;
-
     REQUEST(xAppleDRIDestroySurfaceReq);
     DrawablePtr pDrawable;
-
     REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq);
 
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
@@ -245,7 +250,8 @@ ProcAppleDRIDestroySurface(register ClientPtr client)
         return rc;
 
     if (!DRIDestroySurface(screenInfo.screens[stuff->screen],
-                           (Drawable) stuff->drawable, pDrawable, NULL, NULL)) {
+                           (Drawable)stuff->drawable,
+                           pDrawable, NULL, NULL)) {
         return BadValue;
     }
 
@@ -272,12 +278,14 @@ ProcAppleDRICreatePixmap(ClientPtr client)
         return rc;
 
     if (!DRICreatePixmap(screenInfo.screens[stuff->screen],
-                         (Drawable) stuff->drawable,
-                         pDrawable, path, PATH_MAX)) {
+                         (Drawable)stuff->drawable,
+                         pDrawable,
+                         path, PATH_MAX)) {
         return BadValue;
     }
 
-    if (!DRIGetPixmapData(pDrawable, &width, &height, &pitch, &bpp, &ptr)) {
+    if (!DRIGetPixmapData(pDrawable, &width, &height,
+                          &pitch, &bpp, &ptr)) {
         return BadValue;
     }
 
@@ -317,7 +325,6 @@ ProcAppleDRIDestroyPixmap(ClientPtr client)
 {
     DrawablePtr pDrawable;
     int rc;
-
     REQUEST(xAppleDRIDestroyPixmapReq);
     REQUEST_SIZE_MATCH(xAppleDRIDestroyPixmapReq);
 
@@ -342,6 +349,7 @@ ProcAppleDRIDispatch(register ClientPtr client)
     switch (stuff->data) {
     case X_AppleDRIQueryVersion:
         return ProcAppleDRIQueryVersion(client);
+
     case X_AppleDRIQueryDirectRenderingCapable:
         return ProcAppleDRIQueryDirectRenderingCapable(client);
     }
@@ -352,12 +360,16 @@ ProcAppleDRIDispatch(register ClientPtr client)
     switch (stuff->data) {
     case X_AppleDRIAuthConnection:
         return ProcAppleDRIAuthConnection(client);
+
     case X_AppleDRICreateSurface:
         return ProcAppleDRICreateSurface(client);
+
     case X_AppleDRIDestroySurface:
         return ProcAppleDRIDestroySurface(client);
+
     case X_AppleDRICreatePixmap:
         return ProcAppleDRICreatePixmap(client);
+
     case X_AppleDRIDestroyPixmap:
         return ProcAppleDRIDestroyPixmap(client);
 
@@ -367,7 +379,8 @@ ProcAppleDRIDispatch(register ClientPtr client)
 }
 
 static void
-SNotifyEvent(xAppleDRINotifyEvent * from, xAppleDRINotifyEvent * to)
+SNotifyEvent(xAppleDRINotifyEvent *from,
+             xAppleDRINotifyEvent *to)
 {
     to->type = from->type;
     to->kind = from->kind;
@@ -451,6 +464,7 @@ SProcAppleDRIDispatch(register ClientPtr client)
     switch (stuff->data) {
     case X_AppleDRIQueryVersion:
         return SProcAppleDRIQueryVersion(client);
+
     case X_AppleDRIQueryDirectRenderingCapable:
         return SProcAppleDRIQueryDirectRenderingCapable(client);
     }
@@ -461,12 +475,16 @@ SProcAppleDRIDispatch(register ClientPtr client)
     switch (stuff->data) {
     case X_AppleDRIAuthConnection:
         return SProcAppleDRIAuthConnection(client);
+
     case X_AppleDRICreateSurface:
         return SProcAppleDRICreateSurface(client);
+
     case X_AppleDRIDestroySurface:
         return SProcAppleDRIDestroySurface(client);
+
     case X_AppleDRICreatePixmap:
         return SProcAppleDRICreatePixmap(client);
+
     case X_AppleDRIDestroyPixmap:
         return SProcAppleDRIDestroyPixmap(client);
 
@@ -478,7 +496,7 @@ SProcAppleDRIDispatch(register ClientPtr client)
 void
 AppleDRIExtensionInit(void)
 {
-    ExtensionEntry *extEntry;
+    ExtensionEntry* extEntry;
 
     if (DRIExtensionInit() &&
         (extEntry = AddExtension(APPLEDRINAME,
@@ -486,13 +504,13 @@ AppleDRIExtensionInit(void)
                                  AppleDRINumberErrors,
                                  ProcAppleDRIDispatch,
                                  SProcAppleDRIDispatch,
-                                 AppleDRIResetProc, StandardMinorOpcode))) {
+                                 AppleDRIResetProc,
+                                 StandardMinorOpcode))) {
         size_t i;
-
-        DRIReqCode = (unsigned char) extEntry->base;
+        DRIReqCode = (unsigned char)extEntry->base;
         DRIErrorBase = extEntry->errorBase;
         DRIEventBase = extEntry->eventBase;
         for (i = 0; i < AppleDRINumberEvents; i++)
-            EventSwapVector[DRIEventBase + i] = (EventSwapPtr) SNotifyEvent;
+            EventSwapVector[DRIEventBase + i] = (EventSwapPtr)SNotifyEvent;
     }
 }
diff --git a/xorg-server/hw/xquartz/xpr/appledri.h b/xorg-server/hw/xquartz/xpr/appledri.h
index 36964c6cd..a96c96fc8 100644
--- a/xorg-server/hw/xquartz/xpr/appledri.h
+++ b/xorg-server/hw/xquartz/xpr/appledri.h
@@ -1,30 +1,30 @@
 /* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.7 2000/12/07 20:26:02 dawes Exp $ */
 /**************************************************************************
 
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+   Copyright 2000 VA Linux Systems, Inc.
+   Copyright (c) 2002-2012 Apple Computer, Inc.
+   All Rights Reserved.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sub license, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice (including the
+   next paragraph) shall be included in all copies or substantial portions
+   of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+   IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+   ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
@@ -33,6 +33,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Kevin E. Martin <martin@valinux.com>
  *   Jens Owen <jens@valinux.com>
  *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *   Jeremy Huddleston <jeremyhu@apple.com>
  *
  */
 
@@ -41,81 +42,94 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <X11/Xfuncproto.h>
 
-#define X_AppleDRIQueryVersion			0
-#define X_AppleDRIQueryDirectRenderingCapable	1
-#define X_AppleDRICreateSurface			2
-#define X_AppleDRIDestroySurface		3
-#define X_AppleDRIAuthConnection                4
-#define X_AppleDRICreateSharedBuffer            5
-#define X_AppleDRISwapBuffers                   6
-#define X_AppleDRICreatePixmap                  7
-#define X_AppleDRIDestroyPixmap                 8
+#define X_AppleDRIQueryVersion                0
+#define X_AppleDRIQueryDirectRenderingCapable 1
+#define X_AppleDRICreateSurface               2
+#define X_AppleDRIDestroySurface              3
+#define X_AppleDRIAuthConnection              4
+#define X_AppleDRICreateSharedBuffer          5
+#define X_AppleDRISwapBuffers                 6
+#define X_AppleDRICreatePixmap                7
+#define X_AppleDRIDestroyPixmap               8
 
 /* Requests up to and including 18 were used in a previous version */
 
 /* Events */
-#define AppleDRIObsoleteEvent1		0
-#define AppleDRIObsoleteEvent2		1
-#define AppleDRIObsoleteEvent3		2
-#define AppleDRISurfaceNotify		3
-#define AppleDRINumberEvents		4
+#define AppleDRIObsoleteEvent1 0
+#define AppleDRIObsoleteEvent2 1
+#define AppleDRIObsoleteEvent3 2
+#define AppleDRISurfaceNotify  3
+#define AppleDRINumberEvents   4
 
 /* Errors */
-#define AppleDRIClientNotLocal		0
-#define AppleDRIOperationNotSupported	1
-#define AppleDRINumberErrors		(AppleDRIOperationNotSupported + 1)
+#define AppleDRIClientNotLocal        0
+#define AppleDRIOperationNotSupported 1
+#define AppleDRINumberErrors          (AppleDRIOperationNotSupported + 1)
 
 /* Kinds of SurfaceNotify events: */
-#define AppleDRISurfaceNotifyChanged	0
-#define AppleDRISurfaceNotifyDestroyed	1
+#define AppleDRISurfaceNotifyChanged   0
+#define AppleDRISurfaceNotifyDestroyed 1
 
 #ifndef _APPLEDRI_SERVER_
 
 typedef struct {
-    int	type;		    /* of event */
+    int type;               /* of event */
     unsigned long serial;   /* # of last request processed by server */
-    Bool send_event;	    /* true if this came frome a SendEvent request */
-    Display *display;	    /* Display the event was read from */
-    Window window;	    /* window of event */
-    Time time;		    /* server timestamp when event happened */
-    int kind;		    /* subtype of event */
+    Bool send_event;        /* true if this came frome a SendEvent request */
+    Display *display;       /* Display the event was read from */
+    Window window;          /* window of event */
+    Time time;              /* server timestamp when event happened */
+    int kind;               /* subtype of event */
     int arg;
 } XAppleDRINotifyEvent;
 
 _XFUNCPROTOBEGIN
 
-Bool XAppleDRIQueryExtension (Display *dpy, int *event_base, int *error_base);
+Bool
+XAppleDRIQueryExtension(Display *dpy, int *event_base, int *error_base);
 
-Bool XAppleDRIQueryVersion (Display *dpy, int *majorVersion,
-			    int *minorVersion, int *patchVersion);
+Bool
+XAppleDRIQueryVersion(Display *dpy, int *majorVersion, int *minorVersion,
+                      int *patchVersion);
 
-Bool XAppleDRIQueryDirectRenderingCapable (Display *dpy, int screen,
-					   Bool *isCapable);
+Bool
+XAppleDRIQueryDirectRenderingCapable(Display *dpy, int screen,
+                                     Bool *isCapable);
 
-void *XAppleDRISetSurfaceNotifyHandler (void (*fun) (Display *dpy,
-						     unsigned uid, int kind));
+void *
+XAppleDRISetSurfaceNotifyHandler(void (*fun)(Display *dpy, unsigned uid,
+                                             int kind));
 
-Bool XAppleDRIAuthConnection (Display *dpy, int screen, unsigned int magic);
+Bool
+XAppleDRIAuthConnection(Display *dpy, int screen, unsigned int magic);
 
-Bool XAppleDRICreateSurface (Display *dpy, int screen, Drawable drawable,
-			     unsigned int client_id, unsigned int key[2],
-			     unsigned int* uid);
+Bool XAppleDRICreateSurface(Display * dpy, int screen, Drawable drawable,
+                            unsigned int client_id, unsigned int key[2],
+                            unsigned int* uid);
 
-Bool XAppleDRIDestroySurface (Display *dpy, int screen, Drawable drawable);
+Bool
+XAppleDRIDestroySurface(Display *dpy, int screen, Drawable drawable);
 
-Bool XAppleDRISynchronizeSurfaces (Display *dpy);
+Bool
+XAppleDRISynchronizeSurfaces(Display *dpy);
 
-Bool XAppleDRICreateSharedBuffer(Display *dpy, int screen, Drawable drawable,
-				 Bool doubleSwap, char *path, size_t pathlen,
-				 int *width, int *height);
+Bool
+XAppleDRICreateSharedBuffer(Display *dpy, int screen, Drawable drawable,
+                            Bool doubleSwap, char *path, size_t pathlen,
+                            int *width,
+                            int *height);
 
-Bool XAppleDRISwapBuffers(Display *dpy, int screen, Drawable drawable);
+Bool
+XAppleDRISwapBuffers(Display *dpy, int screen, Drawable drawable);
 
-Bool XAppleDRICreatePixmap(Display *dpy, int screen, Drawable drawable,
-			   int *width, int *height, int *pitch, int *bpp,
-			   size_t *size, char *bufname, size_t bufnamesize);
+Bool
+XAppleDRICreatePixmap(Display *dpy, int screen, Drawable drawable, int *width,
+                      int *height, int *pitch, int *bpp, size_t *size,
+                      char *bufname,
+                      size_t bufnamesize);
 
-Bool XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap);
+Bool
+XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap);
 
 _XFUNCPROTOEND
 
diff --git a/xorg-server/hw/xquartz/xpr/appledristr.h b/xorg-server/hw/xquartz/xpr/appledristr.h
index 131a699d9..71346c428 100644
--- a/xorg-server/hw/xquartz/xpr/appledristr.h
+++ b/xorg-server/hw/xquartz/xpr/appledristr.h
@@ -1,29 +1,29 @@
 /**************************************************************************
 
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+   Copyright 2000 VA Linux Systems, Inc.
+   Copyright (c) 2002-2012 Apple Computer, Inc.
+   All Rights Reserved.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sub license, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice (including the
+   next paragraph) shall be included in all copies or substantial portions
+   of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+   IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+   ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
@@ -32,6 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Kevin E. Martin <martin@valinux.com>
  *   Jens Owen <jens@valinux.com>
  *   Rickard E. (Rik) Fiath <faith@valinux.com>
+ *   Jeremy Huddleston <jeremyhu@apple.com>
  *
  */
 
@@ -40,47 +41,44 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "appledri.h"
 
-#define APPLEDRINAME "Apple-DRI"
+#define APPLEDRINAME            "Apple-DRI"
 
-#define APPLE_DRI_MAJOR_VERSION	1       /* current version numbers */
-#define APPLE_DRI_MINOR_VERSION	0
-#define APPLE_DRI_PATCH_VERSION	0
+#define APPLE_DRI_MAJOR_VERSION 1       /* current version numbers */
+#define APPLE_DRI_MINOR_VERSION 0
+#define APPLE_DRI_PATCH_VERSION 0
 
 typedef struct _AppleDRIQueryVersion {
-    CARD8 reqType;              /* always DRIReqCode */
-    CARD8 driReqType;           /* always X_DRIQueryVersion */
+    CARD8 reqType;               /* always DRIReqCode */
+    CARD8 driReqType;            /* always X_DRIQueryVersion */
     CARD16 length B16;
 } xAppleDRIQueryVersionReq;
-
-#define sz_xAppleDRIQueryVersionReq	4
+#define sz_xAppleDRIQueryVersionReq 4
 
 typedef struct {
-    BYTE type;                  /* X_Reply */
+    BYTE type;                   /* X_Reply */
     BOOL pad1;
     CARD16 sequenceNumber B16;
     CARD32 length B32;
-    CARD16 majorVersion B16;    /* major version of DRI protocol */
-    CARD16 minorVersion B16;    /* minor version of DRI protocol */
-    CARD32 patchVersion B32;    /* patch version of DRI protocol */
+    CARD16 majorVersion B16;     /* major version of DRI protocol */
+    CARD16 minorVersion B16;     /* minor version of DRI protocol */
+    CARD32 patchVersion B32;     /* patch version of DRI protocol */
     CARD32 pad3 B32;
     CARD32 pad4 B32;
     CARD32 pad5 B32;
     CARD32 pad6 B32;
 } xAppleDRIQueryVersionReply;
-
-#define sz_xAppleDRIQueryVersionReply	32
+#define sz_xAppleDRIQueryVersionReply 32
 
 typedef struct _AppleDRIQueryDirectRenderingCapable {
-    CARD8 reqType;              /* always DRIReqCode */
-    CARD8 driReqType;           /* X_DRIQueryDirectRenderingCapable */
+    CARD8 reqType;               /* always DRIReqCode */
+    CARD8 driReqType;            /* X_DRIQueryDirectRenderingCapable */
     CARD16 length B16;
     CARD32 screen B32;
 } xAppleDRIQueryDirectRenderingCapableReq;
-
-#define sz_xAppleDRIQueryDirectRenderingCapableReq	8
+#define sz_xAppleDRIQueryDirectRenderingCapableReq 8
 
 typedef struct {
-    BYTE type;                  /* X_Reply */
+    BYTE type;                   /* X_Reply */
     BOOL pad1;
     CARD16 sequenceNumber B16;
     CARD32 length B32;
@@ -94,18 +92,16 @@ typedef struct {
     CARD32 pad8 B32;
     CARD32 pad9 B32;
 } xAppleDRIQueryDirectRenderingCapableReply;
-
-#define sz_xAppleDRIQueryDirectRenderingCapableReply	32
+#define sz_xAppleDRIQueryDirectRenderingCapableReply 32
 
 typedef struct _AppleDRIAuthConnection {
-    CARD8 reqType;              /* always DRIReqCode */
-    CARD8 driReqType;           /* always X_DRICloseConnection */
+    CARD8 reqType;               /* always DRIReqCode */
+    CARD8 driReqType;            /* always X_DRICloseConnection */
     CARD16 length B16;
     CARD32 screen B32;
     CARD32 magic B32;
 } xAppleDRIAuthConnectionReq;
-
-#define sz_xAppleDRIAuthConnectionReq	12
+#define sz_xAppleDRIAuthConnectionReq 12
 
 typedef struct {
     BYTE type;
@@ -119,22 +115,20 @@ typedef struct {
     CARD32 pad5 B32;
     CARD32 pad6 B32;
 } xAppleDRIAuthConnectionReply;
-
-#define zx_xAppleDRIAuthConnectionReply  32
+#define zx_xAppleDRIAuthConnectionReply 32
 
 typedef struct _AppleDRICreateSurface {
-    CARD8 reqType;              /* always DRIReqCode */
-    CARD8 driReqType;           /* always X_DRICreateSurface */
+    CARD8 reqType;               /* always DRIReqCode */
+    CARD8 driReqType;            /* always X_DRICreateSurface */
     CARD16 length B16;
     CARD32 screen B32;
     CARD32 drawable B32;
     CARD32 client_id B32;
 } xAppleDRICreateSurfaceReq;
-
-#define sz_xAppleDRICreateSurfaceReq	16
+#define sz_xAppleDRICreateSurfaceReq 16
 
 typedef struct {
-    BYTE type;                  /* X_Reply */
+    BYTE type;                   /* X_Reply */
     BOOL pad1;
     CARD16 sequenceNumber B16;
     CARD32 length B32;
@@ -145,24 +139,22 @@ typedef struct {
     CARD32 pad5 B32;
     CARD32 pad6 B32;
 } xAppleDRICreateSurfaceReply;
-
-#define sz_xAppleDRICreateSurfaceReply	32
+#define sz_xAppleDRICreateSurfaceReply 32
 
 typedef struct _AppleDRIDestroySurface {
-    CARD8 reqType;              /* always DRIReqCode */
-    CARD8 driReqType;           /* always X_DRIDestroySurface */
+    CARD8 reqType;               /* always DRIReqCode */
+    CARD8 driReqType;            /* always X_DRIDestroySurface */
     CARD16 length B16;
     CARD32 screen B32;
     CARD32 drawable B32;
 } xAppleDRIDestroySurfaceReq;
-
-#define sz_xAppleDRIDestroySurfaceReq	12
+#define sz_xAppleDRIDestroySurfaceReq 12
 
 typedef struct _AppleDRINotify {
-    BYTE type;                  /* always eventBase + event type */
+    BYTE type;                   /* always eventBase + event type */
     BYTE kind;
     CARD16 sequenceNumber B16;
-    CARD32 time B32;            /* time of change */
+    CARD32 time B32;             /* time of change */
     CARD32 pad1 B32;
     CARD32 arg B32;
     CARD32 pad3 B32;
@@ -170,8 +162,7 @@ typedef struct _AppleDRINotify {
     CARD32 pad5 B32;
     CARD32 pad6 B32;
 } xAppleDRINotifyEvent;
-
-#define sz_xAppleDRINotifyEvent	32
+#define sz_xAppleDRINotifyEvent 32
 
 typedef struct {
     CARD8 reqType;
@@ -190,7 +181,7 @@ typedef struct {
     BYTE data1;
     CARD16 sequenceNumber B16;
     CARD32 length B32;
-    CARD32 stringLength B32;    /* 0 on error */
+    CARD32 stringLength B32;     /* 0 on error */
     CARD32 width B32;
     CARD32 height B32;
     CARD32 pad1 B32;
@@ -211,35 +202,35 @@ typedef struct {
 #define sz_xAppleDRISwapBuffersReq 12
 
 typedef struct {
-    CARD8 reqType;              /*1 */
-    CARD8 driReqType;           /*2 */
-    CARD16 length B16;          /*4 */
-    CARD32 screen B32;          /*8 */
-    CARD32 drawable B32;        /*12 */
+    CARD8 reqType;               /*1 */
+    CARD8 driReqType;            /*2 */
+    CARD16 length B16;           /*4 */
+    CARD32 screen B32;           /*8 */
+    CARD32 drawable B32;         /*12 */
 } xAppleDRICreatePixmapReq;
 
 #define sz_xAppleDRICreatePixmapReq 12
 
 typedef struct {
-    BYTE type;                  /*1 */
-    BOOL pad1;                  /*2 */
-    CARD16 sequenceNumber B16;  /*4 */
-    CARD32 length B32;          /*8 */
-    CARD32 width B32;           /*12 */
-    CARD32 height B32;          /*16 */
-    CARD32 pitch B32;           /*20 */
-    CARD32 bpp B32;             /*24 */
-    CARD32 size B32;            /*28 */
-    CARD32 stringLength B32;    /*32 */
+    BYTE type;                   /*1 */
+    BOOL pad1;                   /*2 */
+    CARD16 sequenceNumber B16;   /*4 */
+    CARD32 length B32;           /*8 */
+    CARD32 width B32;            /*12 */
+    CARD32 height B32;           /*16 */
+    CARD32 pitch B32;            /*20 */
+    CARD32 bpp B32;              /*24 */
+    CARD32 size B32;             /*28 */
+    CARD32 stringLength B32;     /*32 */
 } xAppleDRICreatePixmapReply;
 
 #define sz_xAppleDRICreatePixmapReply 32
 
 typedef struct {
-    CARD8 reqType;              /*1 */
-    CARD8 driReqType;           /*2 */
-    CARD16 length B16;          /*4 */
-    CARD32 drawable B32;        /*8 */
+    CARD8 reqType;               /*1 */
+    CARD8 driReqType;            /*2 */
+    CARD16 length B16;           /*4 */
+    CARD32 drawable B32;         /*8 */
 } xAppleDRIDestroyPixmapReq;
 
 #define sz_xAppleDRIDestroyPixmapReq 8
@@ -248,12 +239,12 @@ typedef struct {
 
 void AppleDRISendEvent(
 #if NeedFunctionPrototypes
-                          int /* type */ ,
-                          unsigned int /* mask */ ,
-                          int /* which */ ,
-                          int   /* arg */
+    int /* type */,
+    unsigned int /* mask */,
+    int /* which */,
+    int                       /* arg */
 #endif
     );
 
-#endif                          /* _APPLEDRI_SERVER_ */
-#endif                          /* _APPLEDRISTR_H_ */
+#endif /* _APPLEDRI_SERVER_ */
+#endif /* _APPLEDRISTR_H_ */
diff --git a/xorg-server/hw/xquartz/xpr/dri.c b/xorg-server/hw/xquartz/xpr/dri.c
index 0ce1d0771..002ec94a7 100644
--- a/xorg-server/hw/xquartz/xpr/dri.c
+++ b/xorg-server/hw/xquartz/xpr/dri.c
@@ -1,29 +1,29 @@
 /**************************************************************************
 
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+   Copyright 2000 VA Linux Systems, Inc.
+   Copyright (c) 2002-2012 Apple Computer, Inc.
+   All Rights Reserved.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sub license, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice (including the
+   next paragraph) shall be included in all copies or substantial portions
+   of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+   IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+   ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
@@ -31,7 +31,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Authors:
  *   Jens Owen <jens@valinux.com>
  *   Rickard E. (Rik) Faith <faith@valinux.com>
- *
+ *   Jeremy Huddleston <jeremyhu@apple.com>
  */
 
 #ifdef HAVE_DIX_CONFIG_H
@@ -75,23 +75,20 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <AvailabilityMacros.h>
 
 static DevPrivateKeyRec DRIScreenPrivKeyRec;
-
-#define DRIScreenPrivKey (&DRIScreenPrivKeyRec)
+#define DRIScreenPrivKey       (&DRIScreenPrivKeyRec)
 static DevPrivateKeyRec DRIWindowPrivKeyRec;
-
-#define DRIWindowPrivKey (&DRIWindowPrivKeyRec)
+#define DRIWindowPrivKey       (&DRIWindowPrivKeyRec)
 static DevPrivateKeyRec DRIPixmapPrivKeyRec;
-
-#define DRIPixmapPrivKey (&DRIPixmapPrivKeyRec)
+#define DRIPixmapPrivKey       (&DRIPixmapPrivKeyRec)
 static DevPrivateKeyRec DRIPixmapBufferPrivKeyRec;
-
 #define DRIPixmapBufferPrivKey (&DRIPixmapBufferPrivKeyRec)
 
 static RESTYPE DRIDrawablePrivResType;
 
 static x_hash_table *surface_hash;      /* maps surface ids -> drawablePrivs */
 
-static Bool DRIFreePixmapImp(DrawablePtr pDrawable);
+static Bool
+DRIFreePixmapImp(DrawablePtr pDrawable);
 
 typedef struct {
     DrawablePtr pDrawable;
@@ -100,8 +97,8 @@ typedef struct {
     int width;
     int height;
     char shmPath[PATH_MAX];
-    int fd;                     /* From shm_open (for now) */
-    size_t length;              /* length of buffer */
+    int fd; /* From shm_open (for now) */
+    size_t length; /* length of buffer */
     void *buffer;
 } DRIPixmapBuffer, *DRIPixmapBufferPtr;
 
@@ -120,7 +117,7 @@ DRIScreenInit(ScreenPtr pScreen)
     if (!dixRegisterPrivateKey(&DRIPixmapBufferPrivKeyRec, PRIVATE_PIXMAP, 0))
         return FALSE;
 
-    pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));
+    pDRIPriv = (DRIScreenPrivPtr)calloc(1, sizeof(DRIScreenPrivRec));
     if (!pDRIPriv) {
         dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
         return FALSE;
@@ -197,7 +194,7 @@ DRIReset(void)
 }
 
 Bool
-DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable)
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -217,8 +214,7 @@ DRIAuthConnection(ScreenPtr pScreen, unsigned int magic)
 
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if (drmAuthMagic(pDRIPriv->drmFD, magic))
-        return FALSE;
+    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;
 #endif
     return TRUE;
 }
@@ -240,7 +236,7 @@ DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)
 #endif
 
     if (pDraw->type == DRAWABLE_WINDOW) {
-        WindowPtr pWin = (WindowPtr) pDraw;
+        WindowPtr pWin = (WindowPtr)pDraw;
         WindowPtr pTopWin = TopLevelParent(pWin);
 
         wc.x = pWin->drawable.x - (pTopWin->drawable.x - pTopWin->borderWidth);
@@ -271,7 +267,8 @@ DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)
 
 /* Return NULL if an error occurs. */
 static DRIDrawablePrivPtr
-CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id * widPtr)
+CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin,
+                       xp_window_id *widPtr)
 {
     DRIDrawablePrivPtr pDRIDrawablePriv;
     xp_window_id wid = 0;
@@ -289,7 +286,7 @@ CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id * widPtr)
             return NULL;
         }
 
-        pDRIDrawablePriv->pDraw = (DrawablePtr) pWin;
+        pDRIDrawablePriv->pDraw = (DrawablePtr)pWin;
         pDRIDrawablePriv->pScreen = pScreen;
         pDRIDrawablePriv->refCount = 0;
         pDRIDrawablePriv->drawableIndex = -1;
@@ -323,7 +320,8 @@ CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id * widPtr)
         }
 
         /* save private off of preallocated index */
-        dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, pDRIDrawablePriv);
+        dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
+                      pDRIDrawablePriv);
     }
 
     *widPtr = wid;
@@ -347,7 +345,7 @@ CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix)
             return NULL;
         }
 
-        pDRIDrawablePriv->pDraw = (DrawablePtr) pPix;
+        pDRIDrawablePriv->pDraw = (DrawablePtr)pPix;
         pDRIDrawablePriv->pScreen = pScreen;
         pDRIDrawablePriv->refCount = 0;
         pDRIDrawablePriv->drawableIndex = -1;
@@ -362,13 +360,14 @@ CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix)
             return NULL;
         }
 
-        /* 
+        /*
          * The DRIUpdateSurface will be called to resize the surface
          * after this function, if the export is successful.
          */
 
         /* save private off of preallocated index */
-        dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, pDRIDrawablePriv);
+        dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey,
+                      pDRIDrawablePriv);
     }
 
     return pDRIDrawablePriv;
@@ -377,8 +376,8 @@ CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix)
 Bool
 DRICreateSurface(ScreenPtr pScreen, Drawable id,
                  DrawablePtr pDrawable, xp_client_id client_id,
-                 xp_surface_id * surface_id, unsigned int ret_key[2],
-                 void (*notify) (void *arg, void *data), void *notify_data)
+                 xp_surface_id *surface_id, unsigned int ret_key[2],
+                 void (*notify)(void *arg, void *data), void *notify_data)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     xp_window_id wid = 0;
@@ -386,18 +385,18 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
         pDRIDrawablePriv = CreateSurfaceForWindow(pScreen,
-                                                  (WindowPtr) pDrawable, &wid);
+                                                  (WindowPtr)pDrawable, &wid);
 
         if (NULL == pDRIDrawablePriv)
-            return FALSE;       /*error */
+            return FALSE;  /*error*/
     }
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
     else if (pDrawable->type == DRAWABLE_PIXMAP) {
         pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen,
-                                                  (PixmapPtr) pDrawable);
+                                                  (PixmapPtr)pDrawable);
 
         if (NULL == pDRIDrawablePriv)
-            return FALSE;       /*error */
+            return FALSE;  /*error*/
     }
 #endif
     else {
@@ -413,25 +412,26 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
         /* try to give the client access to the surface */
         if (client_id != 0) {
             /*
-             * Xplugin accepts a 0 wid if the surface id is offscreen, such 
+             * Xplugin accepts a 0 wid if the surface id is offscreen, such
              * as for a pixmap.
              */
-            err = xp_export_surface(wid, pDRIDrawablePriv->sid, client_id, key);
+            err = xp_export_surface(wid, pDRIDrawablePriv->sid,
+                                    client_id, key);
             if (err != Success) {
                 xp_destroy_surface(pDRIDrawablePriv->sid);
                 free(pDRIDrawablePriv);
 
-                /* 
+                /*
                  * Now set the dix privates to NULL that were previously set.
                  * This prevents reusing an invalid pointer.
                  */
                 if (pDrawable->type == DRAWABLE_WINDOW) {
-                    WindowPtr pWin = (WindowPtr) pDrawable;
+                    WindowPtr pWin = (WindowPtr)pDrawable;
 
                     dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
                 }
                 else if (pDrawable->type == DRAWABLE_PIXMAP) {
-                    PixmapPtr pPix = (PixmapPtr) pDrawable;
+                    PixmapPtr pPix = (PixmapPtr)pDrawable;
 
                     dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
                 }
@@ -449,11 +449,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
         if (surface_hash == NULL)
             surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
         x_hash_table_insert(surface_hash,
-                            x_cvt_uint_to_vptr(pDRIDrawablePriv->sid),
-                            pDRIDrawablePriv);
+                            x_cvt_uint_to_vptr(
+                                pDRIDrawablePriv->sid), pDRIDrawablePriv);
 
         /* track this in case this window is destroyed */
-        AddResource(id, DRIDrawablePrivResType, (pointer) pDrawable);
+        AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
 
         /* Initialize shape */
         DRIUpdateSurface(pDRIDrawablePriv, pDrawable);
@@ -478,15 +478,15 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
 
 Bool
 DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
-                  void (*notify) (void *, void *), void *notify_data)
+                  void (*notify)(void *, void *), void *notify_data)
 {
     DRIDrawablePrivPtr pDRIDrawablePriv;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr) pDrawable);
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr)pDrawable);
     }
     else if (pDrawable->type == DRAWABLE_PIXMAP) {
-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr) pDrawable);
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr)pDrawable);
     }
     else {
         return FALSE;
@@ -498,13 +498,14 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
          */
 
         if (notify != NULL) {
-            pDRIDrawablePriv->notifiers =
-                x_hook_remove(pDRIDrawablePriv->notifiers, notify, notify_data);
+            pDRIDrawablePriv->notifiers = x_hook_remove(
+                pDRIDrawablePriv->notifiers,
+                notify, notify_data);
         }
 
         --pDRIDrawablePriv->refCount;
 
-        /* 
+        /*
          * Check if the drawable privates still have a reference to the
          * surface.
          */
@@ -512,7 +513,7 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
         if (pDRIDrawablePriv->refCount <= 0) {
             /*
              * This calls back to DRIDrawablePrivDelete which
-             * frees the private area and dispatches events, if needed. 
+             * frees the private area and dispatches events, if needed.
              */
             FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
         }
@@ -521,30 +522,30 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
     return TRUE;
 }
 
-/* 
+/*
  * The assumption is that this is called when the refCount of a surface
- * drops to <= 0, or the window/pixmap is destroyed.  
+ * drops to <= 0, or the window/pixmap is destroyed.
  */
 Bool
 DRIDrawablePrivDelete(pointer pResource, XID id)
 {
-    DrawablePtr pDrawable = (DrawablePtr) pResource;
+    DrawablePtr pDrawable = (DrawablePtr)pResource;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
     DRIDrawablePrivPtr pDRIDrawablePriv = NULL;
     WindowPtr pWin = NULL;
     PixmapPtr pPix = NULL;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-        pWin = (WindowPtr) pDrawable;
+        pWin = (WindowPtr)pDrawable;
         pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
     }
     else if (pDrawable->type == DRAWABLE_PIXMAP) {
-        pPix = (PixmapPtr) pDrawable;
+        pPix = (PixmapPtr)pDrawable;
         pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
     }
 
     if (pDRIDrawablePriv == NULL) {
-        /* 
+        /*
          * We reuse __func__ and the resource type for the GLXPixmap code.
          * Attempt to free a pixmap buffer associated with the resource
          * if possible.
@@ -558,7 +559,8 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
     }
 
     if (pDRIDrawablePriv->sid != 0) {
-        DRISurfaceNotify(pDRIDrawablePriv->sid, AppleDRISurfaceNotifyDestroyed);
+        DRISurfaceNotify(pDRIDrawablePriv->sid,
+                         AppleDRISurfaceNotifyDestroyed);
     }
 
     if (pDRIDrawablePriv->notifiers != NULL)
@@ -591,7 +593,7 @@ DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
 
     pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
 
-    (*pScreen->WindowExposures) (pWin, prgn, bsreg);
+    (*pScreen->WindowExposures)(pWin, prgn, bsreg);
 
     pScreen->WindowExposures = DRIWindowExposures;
 }
@@ -614,7 +616,7 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
 
     /* call lower layers */
-    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+    (*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
 
     /* rewrap */
     pScreen->CopyWindow = DRICopyWindow;
@@ -631,7 +633,7 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
     pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
 
     /* call lower layers */
-    returnValue = (*pScreen->ValidateTree) (pParent, pChild, kind);
+    returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);
 
     /* rewrap */
     pScreen->ValidateTree = DRIValidateTree;
@@ -658,7 +660,7 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
         pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
 
         /* call lower layers */
-        (*pScreen->PostValidateTree) (pParent, pChild, kind);
+        (*pScreen->PostValidateTree)(pParent, pChild, kind);
 
         /* rewrap */
         pScreen->PostValidateTree = DRIPostValidateTree;
@@ -679,7 +681,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
     if (pDRIPriv->wrap.ClipNotify) {
         pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
 
-        (*pScreen->ClipNotify) (pWin, dx, dy);
+        (*pScreen->ClipNotify)(pWin, dx, dy);
 
         pScreen->ClipNotify = DRIClipNotify;
     }
@@ -696,14 +698,16 @@ DRIGetWrappedFuncs(ScreenPtr pScreen)
 }
 
 void
-DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion)
+DRIQueryVersion(int *majorVersion,
+                int *minorVersion,
+                int *patchVersion)
 {
     *majorVersion = APPLE_DRI_MAJOR_VERSION;
     *minorVersion = APPLE_DRI_MINOR_VERSION;
     *patchVersion = APPLE_DRI_PATCH_VERSION;
 }
 
-/* 
+/*
  * Note: this also cleans up the hash table in addition to notifying clients.
  * The sid/surface-id should not be used after this, because it will be
  * invalid.
@@ -753,7 +757,8 @@ DRISurfaceNotify(xp_surface_id id, int kind)
  */
 Bool
 DRICreatePixmap(ScreenPtr pScreen, Drawable id,
-                DrawablePtr pDrawable, char *path, size_t pathmax)
+                DrawablePtr pDrawable, char *path,
+                size_t pathmax)
 {
     DRIPixmapBufferPtr shared;
     PixmapPtr pPix;
@@ -761,7 +766,7 @@ DRICreatePixmap(ScreenPtr pScreen, Drawable id,
     if (pDrawable->type != DRAWABLE_PIXMAP)
         return FALSE;
 
-    pPix = (PixmapPtr) pDrawable;
+    pPix = (PixmapPtr)pDrawable;
 
     shared = malloc(sizeof(*shared));
     if (NULL == shared) {
@@ -782,7 +787,8 @@ DRICreatePixmap(ScreenPtr pScreen, Drawable id,
     shared->height = pDrawable->height;
 
     if (-1 == snprintf(shared->shmPath, sizeof(shared->shmPath),
-                       "%d_0x%lx", getpid(), (unsigned long) id)) {
+                       "%d_0x%lx", getpid(),
+                       (unsigned long)id)) {
         FatalError("buffer overflow in %s\n", __func__);
     }
 
@@ -821,7 +827,7 @@ DRICreatePixmap(ScreenPtr pScreen, Drawable id,
 
     dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, shared);
 
-    AddResource(id, DRIDrawablePrivResType, (pointer) pDrawable);
+    AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
 
     return TRUE;
 }
@@ -836,7 +842,7 @@ DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
     if (pDrawable->type != DRAWABLE_PIXMAP)
         return FALSE;
 
-    pPix = (PixmapPtr) pDrawable;
+    pPix = (PixmapPtr)pDrawable;
 
     shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);
 
@@ -864,7 +870,7 @@ DRIFreePixmapImp(DrawablePtr pDrawable)
     if (pDrawable->type != DRAWABLE_PIXMAP)
         return FALSE;
 
-    pPix = (PixmapPtr) pDrawable;
+    pPix = (PixmapPtr)pDrawable;
 
     shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);
 
@@ -876,7 +882,7 @@ DRIFreePixmapImp(DrawablePtr pDrawable)
     shm_unlink(shared->shmPath);
     free(shared);
 
-    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer) NULL);
+    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer)NULL);
 
     return TRUE;
 }
diff --git a/xorg-server/hw/xquartz/xpr/dri.h b/xorg-server/hw/xquartz/xpr/dri.h
index b4342617c..8717a5186 100644
--- a/xorg-server/hw/xquartz/xpr/dri.h
+++ b/xorg-server/hw/xquartz/xpr/dri.h
@@ -1,35 +1,35 @@
 /**************************************************************************
 
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2002, 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+   Copyright (c) 2002-2012 Apple Computer, Inc.
+   All Rights Reserved.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sub license, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice (including the
+   next paragraph) shall be included in all copies or substantial portions
+   of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+   IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+   ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
 /*
  * Authors:
  *   Jens Owen <jens@precisioninsight.com>
- *
+ *   Jeremy Huddleston <jeremyhu@apple.com>
  */
 
 /* Prototypes for AppleDRI functions */
@@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "appledri.h"
 #include <Xplugin.h>
 
-typedef void (*ClipNotifyPtr) (WindowPtr, int, int);
+typedef void (*ClipNotifyPtr)(WindowPtr, int, int);
 
 /*
  * These functions can be wrapped by the DRI.  Each of these have
@@ -63,19 +63,26 @@ typedef struct {
     int kind;
 } DRISurfaceNotifyArg;
 
-extern Bool DRIScreenInit(ScreenPtr pScreen);
+extern Bool
+DRIScreenInit(ScreenPtr pScreen);
 
-extern Bool DRIFinishScreenInit(ScreenPtr pScreen);
+extern Bool
+DRIFinishScreenInit(ScreenPtr pScreen);
 
-extern void DRICloseScreen(ScreenPtr pScreen);
+extern void
+DRICloseScreen(ScreenPtr pScreen);
 
-extern Bool DRIExtensionInit(void);
+extern Bool
+DRIExtensionInit(void);
 
-extern void DRIReset(void);
+extern void
+DRIReset(void);
 
-extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable);
+extern Bool
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable);
 
-extern Bool DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
+extern Bool
+DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
 
 extern Bool DRICreateSurface(ScreenPtr pScreen,
                              Drawable id,
@@ -83,42 +90,52 @@ extern Bool DRICreateSurface(ScreenPtr pScreen,
                              xp_client_id client_id,
                              xp_surface_id * surface_id,
                              unsigned int key[2],
-                             void (*notify) (void *arg, void *data),
+                             void (*notify)(void *arg, void *data),
                              void *notify_data);
 
-extern Bool DRIDestroySurface(ScreenPtr pScreen,
-                              Drawable id,
-                              DrawablePtr pDrawable,
-                              void (*notify) (void *arg, void *data),
-                              void *notify_data);
+extern Bool
+DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+                  void (*notify)(void *arg,
+                                 void *data), void *notify_data);
 
-extern Bool DRIDrawablePrivDelete(pointer pResource, XID id);
+extern Bool
+DRIDrawablePrivDelete(pointer pResource, XID id);
 
-extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
+extern DRIWrappedFuncsRec *
+DRIGetWrappedFuncs(ScreenPtr pScreen);
 
-extern void DRICopyWindow(WindowPtr pWin,
-                          DDXPointRec ptOldOrg, RegionPtr prgnSrc);
+extern void
+DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
 
-extern int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
+extern int
+DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
 
-extern void DRIPostValidateTree(WindowPtr pParent,
-                                WindowPtr pChild, VTKind kind);
+extern void
+DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
 
-extern void DRIClipNotify(WindowPtr pWin, int dx, int dy);
+extern void
+DRIClipNotify(WindowPtr pWin, int dx, int dy);
 
-extern void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg);
+extern void
+DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg);
 
-extern void DRISurfaceNotify(xp_surface_id id, int kind);
+extern void
+DRISurfaceNotify(xp_surface_id id, int kind);
 
-extern void DRIQueryVersion(int *majorVersion,
-                            int *minorVersion, int *patchVersion);
+extern void
+DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion);
 
-extern Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,
-                            DrawablePtr pDrawable, char *path, size_t pathmax);
+extern Bool
+DRICreatePixmap(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+                char *path,
+                size_t pathmax);
 
-extern Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
-                             int *pitch, int *bpp, void **ptr);
+extern Bool
+DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height, int *pitch,
+                 int *bpp,
+                 void **ptr);
 
-extern void DRIDestroyPixmap(DrawablePtr pDrawable);
+extern void
+DRIDestroyPixmap(DrawablePtr pDrawable);
 
 #endif
diff --git a/xorg-server/hw/xquartz/xpr/driWrap.c b/xorg-server/hw/xquartz/xpr/driWrap.c
index eca31b263..5f9f3abd3 100644
--- a/xorg-server/hw/xquartz/xpr/driWrap.c
+++ b/xorg-server/hw/xquartz/xpr/driWrap.c
@@ -1,27 +1,32 @@
 /*
-Copyright (c) 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ * Copyright (c) 2009-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
@@ -55,23 +60,21 @@ typedef struct {
 } DRISavedDrawableState;
 
 static DevPrivateKeyRec driGCKeyRec;
-
 #define driGCKey (&driGCKeyRec)
 
 static DevPrivateKeyRec driWrapScreenKeyRec;
-
 #define driWrapScreenKey (&driWrapScreenKeyRec)
 
 static GCOps driGCOps;
 
 #define wrap(priv, real, member, func) { \
-	priv->member = real->member; \
-	real->member = func; \
-    }
+        priv->member = real->member; \
+        real->member = func; \
+}
 
-#define unwrap(priv, real, member) { \
-	real->member = priv->member; \
-    }
+#define unwrap(priv, real, member)     { \
+        real->member = priv->member; \
+}
 
 static DRIGCRec *
 DRIGetGCPriv(GCPtr pGC)
@@ -94,7 +97,8 @@ DRIWrapGC(GCPtr pGC)
 }
 
 static void
-DRISurfaceSetDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
+DRISurfaceSetDrawable(DrawablePtr pDraw,
+                      DRISavedDrawableState *saved)
 {
     saved->didSave = FALSE;
 
@@ -102,8 +106,9 @@ DRISurfaceSetDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
         int pitch, width, height, bpp;
         void *buffer;
 
-        if (DRIGetPixmapData(pDraw, &width, &height, &pitch, &bpp, &buffer)) {
-            PixmapPtr pPix = (PixmapPtr) pDraw;
+        if (DRIGetPixmapData(pDraw, &width, &height, &pitch, &bpp,
+                             &buffer)) {
+            PixmapPtr pPix = (PixmapPtr)pDraw;
 
             saved->devKind = pPix->devKind;
             saved->devPrivate.ptr = pPix->devPrivate.ptr;
@@ -116,9 +121,10 @@ DRISurfaceSetDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
 }
 
 static void
-DRISurfaceRestoreDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
+DRISurfaceRestoreDrawable(DrawablePtr pDraw,
+                          DRISavedDrawableState *saved)
 {
-    PixmapPtr pPix = (PixmapPtr) pDraw;
+    PixmapPtr pPix = (PixmapPtr)pDraw;
 
     if (!saved->didSave)
         return;
@@ -129,7 +135,8 @@ DRISurfaceRestoreDrawable(DrawablePtr pDraw, DRISavedDrawableState * saved)
 
 static void
 DRIFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
-             DDXPointPtr pptInit, int *pwidthInit, int sorted)
+             DDXPointPtr pptInit, int *pwidthInit,
+             int sorted)
 {
     DRISavedDrawableState saved;
 
@@ -146,7 +153,8 @@ DRIFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
 
 static void
 DRISetSpans(DrawablePtr dst, GCPtr pGC, char *pSrc,
-            DDXPointPtr pptInit, int *pwidthInit, int nspans, int sorted)
+            DDXPointPtr pptInit, int *pwidthInit,
+            int nspans, int sorted)
 {
     DRISavedDrawableState saved;
 
@@ -181,7 +189,8 @@ DRIPutImage(DrawablePtr dst, GCPtr pGC,
 
 static RegionPtr
 DRICopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
-            int srcx, int srcy, int w, int h, int dstx, int dsty)
+            int srcx, int srcy, int w, int h,
+            int dstx, int dsty)
 {
     RegionPtr pReg;
     DRISavedDrawableState pSrcSaved, dstSaved;
@@ -204,7 +213,8 @@ DRICopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
 static RegionPtr
 DRICopyPlane(DrawablePtr pSrc, DrawablePtr dst,
              GCPtr pGC, int srcx, int srcy,
-             int w, int h, int dstx, int dsty, unsigned long plane)
+             int w, int h, int dstx, int dsty,
+             unsigned long plane)
 {
     RegionPtr pReg;
     DRISavedDrawableState pSrcSaved, dstSaved;
@@ -226,7 +236,8 @@ DRICopyPlane(DrawablePtr pSrc, DrawablePtr dst,
 }
 
 static void
-DRIPolyPoint(DrawablePtr dst, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
+DRIPolyPoint(DrawablePtr dst, GCPtr pGC,
+             int mode, int npt, DDXPointPtr pptInit)
 {
     DRISavedDrawableState saved;
 
@@ -242,7 +253,8 @@ DRIPolyPoint(DrawablePtr dst, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
 }
 
 static void
-DRIPolylines(DrawablePtr dst, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
+DRIPolylines(DrawablePtr dst, GCPtr pGC,
+             int mode, int npt, DDXPointPtr pptInit)
 {
     DRISavedDrawableState saved;
 
@@ -258,7 +270,8 @@ DRIPolylines(DrawablePtr dst, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit)
 }
 
 static void
-DRIPolySegment(DrawablePtr dst, GCPtr pGC, int nseg, xSegment * pSeg)
+DRIPolySegment(DrawablePtr dst, GCPtr pGC,
+               int nseg, xSegment *pSeg)
 {
     DRISavedDrawableState saved;
 
@@ -274,7 +287,8 @@ DRIPolySegment(DrawablePtr dst, GCPtr pGC, int nseg, xSegment * pSeg)
 }
 
 static void
-DRIPolyRectangle(DrawablePtr dst, GCPtr pGC, int nRects, xRectangle *pRects)
+DRIPolyRectangle(DrawablePtr dst, GCPtr pGC,
+                 int nRects, xRectangle *pRects)
 {
     DRISavedDrawableState saved;
 
@@ -288,9 +302,8 @@ DRIPolyRectangle(DrawablePtr dst, GCPtr pGC, int nRects, xRectangle *pRects)
 
     DRISurfaceRestoreDrawable(dst, &saved);
 }
-
 static void
-DRIPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc * parcs)
+DRIPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc *parcs)
 {
     DRISavedDrawableState saved;
 
@@ -307,7 +320,8 @@ DRIPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc * parcs)
 
 static void
 DRIFillPolygon(DrawablePtr dst, GCPtr pGC,
-               int shape, int mode, int count, DDXPointPtr pptInit)
+               int shape, int mode, int count,
+               DDXPointPtr pptInit)
 {
     DRISavedDrawableState saved;
 
@@ -340,7 +354,8 @@ DRIPolyFillRect(DrawablePtr dst, GCPtr pGC,
 }
 
 static void
-DRIPolyFillArc(DrawablePtr dst, GCPtr pGC, int narcsInit, xArc * parcsInit)
+DRIPolyFillArc(DrawablePtr dst, GCPtr pGC,
+               int narcsInit, xArc *parcsInit)
 {
     DRISavedDrawableState saved;
 
@@ -356,7 +371,8 @@ DRIPolyFillArc(DrawablePtr dst, GCPtr pGC, int narcsInit, xArc * parcsInit)
 }
 
 static int
-DRIPolyText8(DrawablePtr dst, GCPtr pGC, int x, int y, int count, char *chars)
+DRIPolyText8(DrawablePtr dst, GCPtr pGC,
+             int x, int y, int count, char *chars)
 {
     int ret;
     DRISavedDrawableState saved;
@@ -395,7 +411,8 @@ DRIPolyText16(DrawablePtr dst, GCPtr pGC,
 }
 
 static void
-DRIImageText8(DrawablePtr dst, GCPtr pGC, int x, int y, int count, char *chars)
+DRIImageText8(DrawablePtr dst, GCPtr pGC,
+              int x, int y, int count, char *chars)
 {
     DRISavedDrawableState saved;
 
@@ -430,7 +447,7 @@ DRIImageText16(DrawablePtr dst, GCPtr pGC,
 static void
 DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
                  int x, int y, unsigned int nglyphInit,
-                 CharInfoPtr * ppciInit, pointer unused)
+                 CharInfoPtr *ppciInit, pointer unused)
 {
     DRISavedDrawableState saved;
 
@@ -448,7 +465,7 @@ DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
 static void
 DRIPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
                 int x, int y, unsigned int nglyph,
-                CharInfoPtr * ppci, pointer pglyphBase)
+                CharInfoPtr *ppci, pointer pglyphBase)
 {
     DRISavedDrawableState saved;
 
@@ -539,12 +556,12 @@ DRIWrapInit(ScreenPtr pScreen)
     if (!dixRegisterPrivateKey(&driGCKeyRec, PRIVATE_GC, sizeof(DRIGCRec)))
         return FALSE;
 
-    if (!dixRegisterPrivateKey
-        (&driWrapScreenKeyRec, PRIVATE_SCREEN, sizeof(DRIWrapScreenRec)))
+    if (!dixRegisterPrivateKey(&driWrapScreenKeyRec, PRIVATE_SCREEN,
+                               sizeof(DRIWrapScreenRec)))
         return FALSE;
 
-    pScreenPriv =
-        dixGetPrivateAddr(&pScreen->devPrivates, &driWrapScreenKeyRec);
+    pScreenPriv = dixGetPrivateAddr(&pScreen->devPrivates,
+                                    &driWrapScreenKeyRec);
     pScreenPriv->CreateGC = pScreen->CreateGC;
     pScreen->CreateGC = DRICreateGC;
 
diff --git a/xorg-server/hw/xquartz/xpr/driWrap.h b/xorg-server/hw/xquartz/xpr/driWrap.h
index d31d5ddaf..1bc34ee9e 100644
--- a/xorg-server/hw/xquartz/xpr/driWrap.h
+++ b/xorg-server/hw/xquartz/xpr/driWrap.h
@@ -1,31 +1,36 @@
 /*
-Copyright (c) 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ * Copyright (c) 2009-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef DRIWRAP_H
 #include "scrnintstr.h"
 
-Bool DRIWrapInit(ScreenPtr pScreen);
+Bool
+DRIWrapInit(ScreenPtr pScreen);
 
 #endif /*DRIWRAP_H*/
diff --git a/xorg-server/hw/xquartz/xpr/dristruct.h b/xorg-server/hw/xquartz/xpr/dristruct.h
index 13d590b1f..068e9a253 100644
--- a/xorg-server/hw/xquartz/xpr/dristruct.h
+++ b/xorg-server/hw/xquartz/xpr/dristruct.h
@@ -1,35 +1,35 @@
 /**************************************************************************
 
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+   Copyright (c) 2002-2012 Apple Computer, Inc.
+   All Rights Reserved.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the
+   "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sub license, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice (including the
+   next paragraph) shall be included in all copies or substantial portions
+   of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+   IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+   ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
 /*
  * Authors:
  *   Jens Owen <jens@precisioninsight.com>
- *
+ *   Jeremy Huddleston <jeremyhu@apple.com>
  */
 
 #ifndef DRI_STRUCT_H
@@ -41,10 +41,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DRI_MAX_DRAWABLES 256
 
 #define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \
-    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))
+                                             dixLookupPrivate(&(pWin)-> \
+                                                              devPrivates, \
+                                                              DRIWindowPrivKey))
 
 #define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
-    dixLookupPrivate(&(pPix)->devPrivates, DRIPixmapPrivKey))
+                                             dixLookupPrivate(&(pPix)-> \
+                                                              devPrivates, \
+                                                              DRIPixmapPrivKey))
 
 typedef struct _DRIDrawablePrivRec {
     xp_surface_id sid;
@@ -53,15 +57,22 @@ typedef struct _DRIDrawablePrivRec {
     ScreenPtr pScreen;
     int refCount;
     unsigned int key[2];
-    x_list *notifiers;          /* list of (FUN . DATA) */
+    x_list          *notifiers;     /* list of (FUN . DATA) */
 } DRIDrawablePrivRec, *DRIDrawablePrivPtr;
 
-#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey))
+#define DRI_SCREEN_PRIV(pScreen)                ((DRIScreenPrivPtr) \
+                                                 dixLookupPrivate(&(pScreen) \
+                                                                  -> \
+                                                                  devPrivates, \
+                                                                  DRIScreenPrivKey))
 
 #define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
-    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
-		     DRIScreenPrivKey))
+                                                 dixLookupPrivate(&screenInfo \
+                                                                  .screens[ \
+                                                                      screenIndex \
+                                                                  ]-> \
+                                                                  devPrivates, \
+                                                                  DRIScreenPrivKey))
 
 typedef struct _DRIScreenPrivRec {
     Bool directRenderingSupport;
@@ -70,4 +81,4 @@ typedef struct _DRIScreenPrivRec {
     DrawablePtr DRIDrawables[DRI_MAX_DRAWABLES];
 } DRIScreenPrivRec, *DRIScreenPrivPtr;
 
-#endif                          /* DRI_STRUCT_H */
+#endif /* DRI_STRUCT_H */
diff --git a/xorg-server/hw/xquartz/xpr/x-hash.c b/xorg-server/hw/xquartz/xpr/x-hash.c
index a3ff66177..26e079ff0 100644
--- a/xorg-server/hw/xquartz/xpr/x-hash.c
+++ b/xorg-server/hw/xquartz/xpr/x-hash.c
@@ -1,31 +1,32 @@
 /* x-hash.c - basic hash tables
-
-   Copyright (c) 2002 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
@@ -47,59 +48,61 @@ struct x_hash_table_struct {
     x_destroy_fun *destroy_value;
 };
 
-#define ITEM_NEW(k, v) X_PFX (list_prepend) ((x_list *) (k), v)
-#define ITEM_FREE(i) X_PFX (list_free_1) (i)
-#define ITEM_KEY(i) ((void *) (i)->next)
-#define ITEM_VALUE(i) ((i)->data)
+#define ITEM_NEW(k, v) X_PFX(list_prepend) ((x_list *)(k), v)
+#define ITEM_FREE(i)   X_PFX(list_free_1) (i)
+#define ITEM_KEY(i)    ((void *)(i)->next)
+#define ITEM_VALUE(i)  ((i)->data)
 
 #define SPLIT_THRESHOLD_FACTOR 2
 
 /* http://planetmath.org/?op=getobj&from=objects&name=GoodHashTablePrimes */
 static const unsigned int bucket_sizes[] = {
-    29, 53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593, 49157,
-    98317, 196613, 393241, 786433, 1572869, 3145739, 6291469, 12582917,
+    29,       53,        97,        193,        389,        769,       1543,
+    3079,     6151, 12289, 24593, 49157,
+    98317,    196613,   393241,    786433,    1572869,   3145739,   6291469,
+    12582917,
     25165843, 50331653, 100663319, 201326611, 402653189, 805306457,
     1610612741
 };
 
-#define N_BUCKET_SIZES (sizeof (bucket_sizes) / sizeof (bucket_sizes[0]))
+#define N_BUCKET_SIZES (sizeof(bucket_sizes) / sizeof(bucket_sizes[0]))
 
 static inline unsigned int
-hash_table_total_buckets(x_hash_table * h)
+hash_table_total_buckets(x_hash_table *h)
 {
     return bucket_sizes[h->bucket_index];
 }
 
 static inline void
-hash_table_destroy_item(x_hash_table * h, void *k, void *v)
+hash_table_destroy_item(x_hash_table *h, void *k, void *v)
 {
     if (h->destroy_key != 0)
-        (*h->destroy_key) (k);
+        (*h->destroy_key)(k);
 
     if (h->destroy_value != 0)
-        (*h->destroy_value) (v);
+        (*h->destroy_value)(v);
 }
 
 static inline size_t
-hash_table_hash_key(x_hash_table * h, void *k)
+hash_table_hash_key(x_hash_table *h, void *k)
 {
     if (h->hash_key != 0)
-        return (*h->hash_key) (k);
+        return (*h->hash_key)(k);
     else
-        return (size_t) k;
+        return (size_t)k;
 }
 
 static inline int
-hash_table_compare_keys(x_hash_table * h, void *k1, void *k2)
+hash_table_compare_keys(x_hash_table *h, void *k1, void *k2)
 {
     if (h->compare_keys == 0)
         return k1 == k2;
     else
-        return (*h->compare_keys) (k1, k2) == 0;
+        return (*h->compare_keys)(k1, k2) == 0;
 }
 
 static void
-hash_table_split(x_hash_table * h)
+hash_table_split(x_hash_table *h)
 {
     x_list **new, **old;
     x_list *node, *item, *next;
@@ -139,10 +142,11 @@ hash_table_split(x_hash_table * h)
     free(old);
 }
 
-X_EXTERN x_hash_table *X_PFX(hash_table_new) (x_hash_fun * hash,
-                                              x_compare_fun * compare,
-                                              x_destroy_fun * key_destroy,
-                                              x_destroy_fun * value_destroy) {
+X_EXTERN x_hash_table *
+X_PFX(hash_table_new) (x_hash_fun * hash,
+                       x_compare_fun * compare,
+                       x_destroy_fun * key_destroy,
+                       x_destroy_fun * value_destroy) {
     x_hash_table *h;
 
     h = calloc(1, sizeof(x_hash_table));
@@ -166,7 +170,7 @@ X_EXTERN x_hash_table *X_PFX(hash_table_new) (x_hash_fun * hash,
 }
 
 X_EXTERN void
- X_PFX(hash_table_free) (x_hash_table * h) {
+X_PFX(hash_table_free) (x_hash_table * h) {
     int n, i;
     x_list *node, *item;
 
@@ -188,14 +192,14 @@ X_EXTERN void
 }
 
 X_EXTERN unsigned int
- X_PFX(hash_table_size) (x_hash_table * h) {
+X_PFX(hash_table_size) (x_hash_table * h) {
     assert(h != NULL);
 
     return h->total_keys;
 }
 
 static void
-hash_table_modify(x_hash_table * h, void *k, void *v, int replace)
+hash_table_modify(x_hash_table *h, void *k, void *v, int replace)
 {
     size_t hash_value;
     x_list *node, *item;
@@ -210,7 +214,8 @@ hash_table_modify(x_hash_table * h, void *k, void *v, int replace)
 
         if (hash_table_compare_keys(h, ITEM_KEY(item), k)) {
             if (replace) {
-                hash_table_destroy_item(h, ITEM_KEY(item), ITEM_VALUE(item));
+                hash_table_destroy_item(h, ITEM_KEY(item),
+                                        ITEM_VALUE(item));
                 item->next = k;
                 ITEM_VALUE(item) = v;
             }
@@ -236,17 +241,17 @@ hash_table_modify(x_hash_table * h, void *k, void *v, int replace)
 }
 
 X_EXTERN void
- X_PFX(hash_table_insert) (x_hash_table * h, void *k, void *v) {
+X_PFX(hash_table_insert) (x_hash_table * h, void *k, void *v) {
     hash_table_modify(h, k, v, 0);
 }
 
 X_EXTERN void
- X_PFX(hash_table_replace) (x_hash_table * h, void *k, void *v) {
+X_PFX(hash_table_replace) (x_hash_table * h, void *k, void *v) {
     hash_table_modify(h, k, v, 1);
 }
 
 X_EXTERN void
- X_PFX(hash_table_remove) (x_hash_table * h, void *k) {
+X_PFX(hash_table_remove) (x_hash_table * h, void *k) {
     size_t hash_value;
     x_list **ptr, *item;
 
@@ -270,8 +275,8 @@ X_EXTERN void
     }
 }
 
-X_EXTERN void *X_PFX(hash_table_lookup) (x_hash_table * h, void *k,
-                                         void **k_ret) {
+X_EXTERN void *
+X_PFX(hash_table_lookup) (x_hash_table * h, void *k, void **k_ret) {
     size_t hash_value;
     x_list *node, *item;
 
@@ -298,7 +303,6 @@ X_EXTERN void *X_PFX(hash_table_lookup) (x_hash_table * h, void *k,
 }
 
 X_EXTERN void
-
 X_PFX(hash_table_foreach) (x_hash_table * h,
                            x_hash_foreach_fun * fun, void *data) {
     int i, n;
@@ -311,7 +315,7 @@ X_PFX(hash_table_foreach) (x_hash_table * h,
     for (i = 0; i < n; i++) {
         for (node = h->buckets[i]; node != 0; node = node->next) {
             item = node->data;
-            (*fun) (ITEM_KEY(item), ITEM_VALUE(item), data);
+            (*fun)(ITEM_KEY(item), ITEM_VALUE(item), data);
         }
     }
 }
diff --git a/xorg-server/hw/xquartz/xpr/x-hash.h b/xorg-server/hw/xquartz/xpr/x-hash.h
index c4543346a..2cdae7c5d 100644
--- a/xorg-server/hw/xquartz/xpr/x-hash.h
+++ b/xorg-server/hw/xquartz/xpr/x-hash.h
@@ -1,31 +1,32 @@
 /* x-hash.h -- basic hash table class
-
-   Copyright (c) 2002 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef X_HASH_H
 #define X_HASH_H 1
@@ -35,10 +36,10 @@
 
 typedef struct x_hash_table_struct x_hash_table;
 
-typedef int (x_compare_fun) (const void *a, const void *b);
-typedef unsigned int (x_hash_fun) (const void *k);
-typedef void (x_destroy_fun) (void *x);
-typedef void (x_hash_foreach_fun) (void *k, void *v, void *data);
+typedef int (x_compare_fun)(const void *a, const void *b);
+typedef unsigned int (x_hash_fun)(const void *k);
+typedef void (x_destroy_fun)(void *x);
+typedef void (x_hash_foreach_fun)(void *k, void *v, void *data);
 
 /* for X_PFX and X_EXTERN */
 #include "x-list.h"
@@ -57,25 +58,27 @@ X_EXTERN void X_PFX(hash_table_remove) (x_hash_table * h, void *k);
 X_EXTERN void *X_PFX(hash_table_lookup) (x_hash_table * h,
                                          void *k, void **k_ret);
 X_EXTERN void X_PFX(hash_table_foreach) (x_hash_table * h,
-                                         x_hash_foreach_fun * fun, void *data);
+                                         x_hash_foreach_fun * fun,
+                                         void *data);
 
 /* Conversion between unsigned int (e.g. xp_resource_id) and void pointer */
 
 /* Forward declarations */
-static __inline__ void *X_PFX(cvt_uint_to_vptr) (unsigned int val)
-    __attribute__ ((always_inline));
+static __inline__ void *
+X_PFX(cvt_uint_to_vptr) (unsigned int val) __attribute__((always_inline));
 static __inline__ unsigned int
- X_PFX(cvt_vptr_to_uint) (void *val) __attribute__ ((always_inline));
+X_PFX(cvt_vptr_to_uint) (void * val) __attribute__((always_inline));
 
 /* Implementations */
-static __inline__ void *X_PFX(cvt_uint_to_vptr) (unsigned int val) {
-    return (void *) ((unsigned long) (val));
+static __inline__ void *
+X_PFX(cvt_uint_to_vptr) (unsigned int val) {
+    return (void *)((unsigned long)(val));
 }
 
 static __inline__ unsigned int
- X_PFX(cvt_vptr_to_uint) (void *val) {
-    size_t sv = (size_t) val;
-    unsigned int uv = (unsigned int) sv;
+X_PFX(cvt_vptr_to_uint) (void * val) {
+    size_t sv = (size_t)val;
+    unsigned int uv = (unsigned int)sv;
 
     /* If this assert fails, chances are val actually is a pointer,
        or there's been memory corruption */
@@ -84,4 +87,4 @@ static __inline__ unsigned int
     return uv;
 }
 
-#endif                          /* X_HASH_H */
+#endif /* X_HASH_H */
diff --git a/xorg-server/hw/xquartz/xpr/x-hook.c b/xorg-server/hw/xquartz/xpr/x-hook.c
index fd34658e7..b5d8ab90e 100644
--- a/xorg-server/hw/xquartz/xpr/x-hook.c
+++ b/xorg-server/hw/xquartz/xpr/x-hook.c
@@ -1,31 +1,32 @@
 /* x-hook.c
-
-   Copyright (c) 2003 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
@@ -36,18 +37,18 @@
 #include <assert.h>
 #include "os.h"
 
-#define CELL_NEW(f,d) X_PFX (list_prepend) ((x_list *) (f), (d))
-#define CELL_FREE(c)  X_PFX (list_free_1) (c)
-#define CELL_FUN(c)   ((x_hook_function *) ((c)->next))
-#define CELL_DATA(c)  ((c)->data)
+#define CELL_NEW(f, d) X_PFX(list_prepend) ((x_list *)(f), (d))
+#define CELL_FREE(c)   X_PFX(list_free_1) (c)
+#define CELL_FUN(c)    ((x_hook_function *)((c)->next))
+#define CELL_DATA(c)   ((c)->data)
 
-X_EXTERN x_list *X_PFX(hook_add) (x_list * lst, x_hook_function * fun,
-                                  void *data) {
+X_EXTERN x_list *
+X_PFX(hook_add) (x_list * lst, x_hook_function * fun, void *data) {
     return X_PFX(list_prepend) (lst, CELL_NEW(fun, data));
 }
 
-X_EXTERN x_list *X_PFX(hook_remove) (x_list * lst, x_hook_function * fun,
-                                     void *data) {
+X_EXTERN x_list *
+X_PFX(hook_remove) (x_list * lst, x_hook_function * fun, void *data) {
     x_list *node, *cell;
     x_list *to_delete = NULL;
 
@@ -68,7 +69,7 @@ X_EXTERN x_list *X_PFX(hook_remove) (x_list * lst, x_hook_function * fun,
 }
 
 X_EXTERN void
- X_PFX(hook_run) (x_list * lst, void *arg) {
+X_PFX(hook_run) (x_list * lst, void *arg) {
     x_list *node, *cell;
     x_hook_function **fun;
     void **data;
@@ -92,7 +93,7 @@ X_EXTERN void
     }
 
     for (i = 0; i < length; i++) {
-        (*fun[i]) (arg, data[i]);
+        (*fun[i])(arg, data[i]);
     }
 
     free(fun);
@@ -100,7 +101,7 @@ X_EXTERN void
 }
 
 X_EXTERN void
- X_PFX(hook_free) (x_list * lst) {
+X_PFX(hook_free) (x_list * lst) {
     x_list *node;
 
     for (node = lst; node != NULL; node = node->next) {
diff --git a/xorg-server/hw/xquartz/xpr/x-hook.h b/xorg-server/hw/xquartz/xpr/x-hook.h
index da3407f92..7ba8ac9f6 100644
--- a/xorg-server/hw/xquartz/xpr/x-hook.h
+++ b/xorg-server/hw/xquartz/xpr/x-hook.h
@@ -1,38 +1,39 @@
 /* x-hook.h -- lists of function,data pairs to call.
-
-   Copyright (c) 2003 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2003-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef X_HOOK_H
 #define X_HOOK_H 1
 
 #include "x-list.h"
 
-typedef void x_hook_function(void *arg, void *data);
+typedef void x_hook_function (void *arg, void *data);
 
 X_EXTERN x_list *X_PFX(hook_add) (x_list * lst, x_hook_function * fun,
                                   void *data);
@@ -41,4 +42,4 @@ X_EXTERN x_list *X_PFX(hook_remove) (x_list * lst, x_hook_function * fun,
 X_EXTERN void X_PFX(hook_run) (x_list * lst, void *arg);
 X_EXTERN void X_PFX(hook_free) (x_list * lst);
 
-#endif                          /* X_HOOK_H */
+#endif /* X_HOOK_H */
diff --git a/xorg-server/hw/xquartz/xpr/x-list.c b/xorg-server/hw/xquartz/xpr/x-list.c
index 757ff4cb0..29543d4e0 100644
--- a/xorg-server/hw/xquartz/xpr/x-list.c
+++ b/xorg-server/hw/xquartz/xpr/x-list.c
@@ -1,31 +1,32 @@
 /* x-list.c
-
-   Copyright (c) 2002 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
@@ -50,14 +51,14 @@ static x_list *freelist;
 static pthread_mutex_t freelist_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static inline void
-list_free_1(x_list * node)
+list_free_1(x_list *node)
 {
     node->next = freelist;
     freelist = node;
 }
 
 X_EXTERN void
- X_PFX(list_free_1) (x_list * node) {
+X_PFX(list_free_1) (x_list * node) {
     assert(node != NULL);
 
     pthread_mutex_lock(&freelist_lock);
@@ -68,7 +69,7 @@ X_EXTERN void
 }
 
 X_EXTERN void
- X_PFX(list_free) (x_list * lst) {
+X_PFX(list_free) (x_list * lst) {
     x_list *next;
 
     pthread_mutex_lock(&freelist_lock);
@@ -81,7 +82,8 @@ X_EXTERN void
     pthread_mutex_unlock(&freelist_lock);
 }
 
-X_EXTERN x_list *X_PFX(list_prepend) (x_list * lst, void *data) {
+X_EXTERN x_list *
+X_PFX(list_prepend) (x_list * lst, void *data) {
     x_list *node;
 
     pthread_mutex_lock(&freelist_lock);
@@ -111,7 +113,8 @@ X_EXTERN x_list *X_PFX(list_prepend) (x_list * lst, void *data) {
     return node;
 }
 
-X_EXTERN x_list *X_PFX(list_append) (x_list * lst, void *data) {
+X_EXTERN x_list *
+X_PFX(list_append) (x_list * lst, void *data) {
     x_list *head = lst;
 
     if (lst == NULL)
@@ -125,10 +128,12 @@ X_EXTERN x_list *X_PFX(list_append) (x_list * lst, void *data) {
     return head;
 }
 
-X_EXTERN x_list *X_PFX(list_reverse) (x_list * lst) {
+X_EXTERN x_list *
+X_PFX(list_reverse) (x_list * lst) {
     x_list *head = NULL, *next;
 
-    while (lst != NULL) {
+    while (lst != NULL)
+    {
         next = lst->next;
         lst->next = head;
         head = lst;
@@ -138,7 +143,8 @@ X_EXTERN x_list *X_PFX(list_reverse) (x_list * lst) {
     return head;
 }
 
-X_EXTERN x_list *X_PFX(list_find) (x_list * lst, void *data) {
+X_EXTERN x_list *
+X_PFX(list_find) (x_list * lst, void *data) {
     for (; lst != NULL; lst = lst->next) {
         if (lst->data == data)
             return lst;
@@ -147,19 +153,20 @@ X_EXTERN x_list *X_PFX(list_find) (x_list * lst, void *data) {
     return NULL;
 }
 
-X_EXTERN x_list *X_PFX(list_nth) (x_list * lst, int n) {
+X_EXTERN x_list *
+X_PFX(list_nth) (x_list * lst, int n) {
     while (n-- > 0 && lst != NULL)
         lst = lst->next;
 
     return lst;
 }
 
-X_EXTERN x_list *X_PFX(list_pop) (x_list * lst, void **data_ret) {
+X_EXTERN x_list *
+X_PFX(list_pop) (x_list * lst, void **data_ret) {
     void *data = NULL;
 
     if (lst != NULL) {
         x_list *tem = lst;
-
         data = lst->data;
         lst = lst->next;
         X_PFX(list_free_1) (tem);
@@ -171,22 +178,22 @@ X_EXTERN x_list *X_PFX(list_pop) (x_list * lst, void **data_ret) {
     return lst;
 }
 
-X_EXTERN x_list *X_PFX(list_filter) (x_list * lst,
-                                     int (*pred) (void *item, void *data),
-                                     void *data) {
+X_EXTERN x_list *
+X_PFX(list_filter) (x_list * lst,
+                    int (*pred)(void *item, void *data), void *data) {
     x_list *ret = NULL, *node;
 
     for (node = lst; node != NULL; node = node->next) {
-        if ((*pred) (node->data, data))
+        if ((*pred)(node->data, data))
             ret = X_PFX(list_prepend) (ret, node->data);
     }
 
     return X_PFX(list_reverse) (ret);
 }
 
-X_EXTERN x_list *X_PFX(list_map) (x_list * lst,
-                                  void *(*fun) (void *item, void *data),
-                                  void *data) {
+X_EXTERN x_list *
+X_PFX(list_map) (x_list * lst,
+                 void *(*fun)(void *item, void *data), void *data) {
     x_list *ret = NULL, *node;
 
     for (node = lst; node != NULL; node = node->next) {
@@ -196,7 +203,8 @@ X_EXTERN x_list *X_PFX(list_map) (x_list * lst,
     return X_PFX(list_reverse) (ret);
 }
 
-X_EXTERN x_list *X_PFX(list_copy) (x_list * lst) {
+X_EXTERN x_list *
+X_PFX(list_copy) (x_list * lst) {
     x_list *copy = NULL;
 
     for (; lst != NULL; lst = lst->next) {
@@ -206,7 +214,8 @@ X_EXTERN x_list *X_PFX(list_copy) (x_list * lst) {
     return X_PFX(list_reverse) (copy);
 }
 
-X_EXTERN x_list *X_PFX(list_remove) (x_list * lst, void *data) {
+X_EXTERN x_list *
+X_PFX(list_remove) (x_list * lst, void *data) {
     x_list **ptr, *node;
 
     for (ptr = &lst; *ptr != NULL;) {
@@ -224,7 +233,7 @@ X_EXTERN x_list *X_PFX(list_remove) (x_list * lst, void *data) {
 }
 
 X_EXTERN unsigned int
- X_PFX(list_length) (x_list * lst) {
+X_PFX(list_length) (x_list * lst) {
     unsigned int n;
 
     n = 0;
@@ -235,17 +244,17 @@ X_EXTERN unsigned int
 }
 
 X_EXTERN void
-
 X_PFX(list_foreach) (x_list * lst,
-                     void (*fun) (void *data, void *user_data),
+                     void (*fun)(void *data, void *user_data),
                      void *user_data) {
     for (; lst != NULL; lst = lst->next) {
-        (*fun) (lst->data, user_data);
+        (*fun)(lst->data, user_data);
     }
 }
 
 static x_list *
-list_sort_1(x_list * lst, int length, int (*less) (const void *, const void *))
+list_sort_1(x_list *lst, int length,
+            int (*less)(const void *, const void *))
 {
     x_list *mid, *ptr;
     x_list *out_head, *out;
@@ -274,13 +283,14 @@ list_sort_1(x_list * lst, int length, int (*less) (const void *, const void *))
 
     assert(lst != NULL && mid != NULL);
 
-    if ((*less) (mid->data, lst->data))
+    if ((*less)(mid->data, lst->data))
         out = out_head = mid, mid = mid->next;
     else
         out = out_head = lst, lst = lst->next;
 
-    while (lst != NULL && mid != NULL) {
-        if ((*less) (mid->data, lst->data))
+    while (lst != NULL && mid != NULL)
+    {
+        if ((*less)(mid->data, lst->data))
             out = out->next = mid, mid = mid->next;
         else
             out = out->next = lst, lst = lst->next;
@@ -294,8 +304,8 @@ list_sort_1(x_list * lst, int length, int (*less) (const void *, const void *))
     return out_head;
 }
 
-X_EXTERN x_list *X_PFX(list_sort) (x_list * lst,
-                                   int (*less) (const void *, const void *)) {
+X_EXTERN x_list *
+X_PFX(list_sort) (x_list * lst, int (*less)(const void *, const void *)) {
     int length;
 
     length = X_PFX(list_length) (lst);
diff --git a/xorg-server/hw/xquartz/xpr/x-list.h b/xorg-server/hw/xquartz/xpr/x-list.h
index 04af024a2..28385fd99 100644
--- a/xorg-server/hw/xquartz/xpr/x-list.h
+++ b/xorg-server/hw/xquartz/xpr/x-list.h
@@ -1,31 +1,32 @@
 /* x-list.h -- simple list type
-
-   Copyright (c) 2002 Apple Computer, 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 ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
+ *
+ * Copyright (c) 2002-2012 Apple 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
 
 #ifndef X_LIST_H
 #define X_LIST_H 1
@@ -40,38 +41,38 @@ struct x_list_struct {
 };
 
 #ifndef X_PFX
-# define X_PFX(x) x_ ## x
+#define X_PFX(x) x_ ## x
 #endif
 
 #ifndef X_EXTERN
-# define X_EXTERN __private_extern__
+#define X_EXTERN __private_extern__
 #endif
 
-X_EXTERN void X_PFX (list_free_1) (x_list *node);
-X_EXTERN x_list *X_PFX (list_prepend) (x_list *lst, void *data);
-
-X_EXTERN x_list *X_PFX (list_append) (x_list *lst, void *data);
-X_EXTERN x_list *X_PFX (list_remove) (x_list *lst, void *data);
-X_EXTERN void X_PFX (list_free) (x_list *lst);
-X_EXTERN x_list *X_PFX (list_pop) (x_list *lst, void **data_ret);
-
-X_EXTERN x_list *X_PFX (list_copy) (x_list *lst);
-X_EXTERN x_list *X_PFX (list_reverse) (x_list *lst);
-X_EXTERN x_list *X_PFX (list_find) (x_list *lst, void *data);
-X_EXTERN x_list *X_PFX (list_nth) (x_list *lst, int n);
-X_EXTERN x_list *X_PFX (list_filter) (x_list *src,
-                                      int (*pred) (void *item, void *data),
-                                      void *data);
-X_EXTERN x_list *X_PFX (list_map) (x_list *src,
-                                   void *(*fun) (void *item, void *data),
-                                   void *data);
-
-X_EXTERN unsigned int X_PFX (list_length) (x_list *lst);
-X_EXTERN void X_PFX (list_foreach) (x_list *lst, void (*fun)
-                                    (void *data, void *user_data),
-                                    void *user_data);
-
-X_EXTERN x_list *X_PFX (list_sort) (x_list *lst, int (*less) (const void *,
-                                    const void *));
+X_EXTERN void X_PFX(list_free_1) (x_list * node);
+X_EXTERN x_list *X_PFX(list_prepend) (x_list * lst, void *data);
+
+X_EXTERN x_list *X_PFX(list_append) (x_list * lst, void *data);
+X_EXTERN x_list *X_PFX(list_remove) (x_list * lst, void *data);
+X_EXTERN void X_PFX(list_free) (x_list * lst);
+X_EXTERN x_list *X_PFX(list_pop) (x_list * lst, void **data_ret);
+
+X_EXTERN x_list *X_PFX(list_copy) (x_list * lst);
+X_EXTERN x_list *X_PFX(list_reverse) (x_list * lst);
+X_EXTERN x_list *X_PFX(list_find) (x_list * lst, void *data);
+X_EXTERN x_list *X_PFX(list_nth) (x_list * lst, int n);
+X_EXTERN x_list *X_PFX(list_filter) (x_list * src,
+                                     int (*pred)(void *item, void *data),
+                                     void *data);
+X_EXTERN x_list *X_PFX(list_map) (x_list * src,
+                                  void *(*fun)(void *item, void *data),
+                                  void *data);
+
+X_EXTERN unsigned int X_PFX(list_length) (x_list * lst);
+X_EXTERN void X_PFX(list_foreach) (x_list * lst, void (*fun)
+                                   (void *data, void *user_data),
+                                   void *user_data);
+
+X_EXTERN x_list *X_PFX(list_sort) (x_list * lst,
+                                   int (*less)(const void *, const void *));
 
 #endif /* X_LIST_H */
diff --git a/xorg-server/hw/xquartz/xpr/xpr.h b/xorg-server/hw/xquartz/xpr/xpr.h
index 0b138ddd7..fc614ebc3 100644
--- a/xorg-server/hw/xquartz/xpr/xpr.h
+++ b/xorg-server/hw/xquartz/xpr/xpr.h
@@ -2,6 +2,7 @@
  * Xplugin rootless implementation
  *
  * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2002-2012 Apple 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"),
@@ -36,21 +37,31 @@
 #include "darwin.h"
 
 #undef DEBUG_LOG
-#define DEBUG_LOG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpr", msg, ##args)
+#define DEBUG_LOG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "xpr", msg, ## args)
 
-Bool QuartzModeBundleInit(void);
+Bool
+QuartzModeBundleInit(void);
 
-void AppleDRIExtensionInit(void);
-void xprAppleWMInit(void);
-Bool xprInit(ScreenPtr pScreen);
-Bool xprIsX11Window(int windowNumber);
-WindowPtr xprGetXWindow(xp_window_id wid);
+void
+AppleDRIExtensionInit(void);
+void
+xprAppleWMInit(void);
+Bool
+xprInit(ScreenPtr pScreen);
+Bool
+xprIsX11Window(int windowNumber);
+WindowPtr
+xprGetXWindow(xp_window_id wid);
 
-void xprHideWindows(Bool hide);
+void
+xprHideWindows(Bool hide);
 
-Bool QuartzInitCursor(ScreenPtr pScreen);
-void QuartzSuspendXCursor(ScreenPtr pScreen);
-void QuartzResumeXCursor(ScreenPtr pScreen);
+Bool
+QuartzInitCursor(ScreenPtr pScreen);
+void
+QuartzSuspendXCursor(ScreenPtr pScreen);
+void
+QuartzResumeXCursor(ScreenPtr pScreen);
 
 /* If we are rooted, we need the root window and desktop levels to be below
  * the menubar (24) but above native windows.  Normal window level is 0.
@@ -59,11 +70,11 @@ void QuartzResumeXCursor(ScreenPtr pScreen);
  */
 
 #include <X11/extensions/applewmconst.h>
-static const int normal_window_levels[AppleWMNumWindowLevels+1] = {
-0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,
+static const int normal_window_levels[AppleWMNumWindowLevels + 1] = {
+    0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,
 };
-static const int rooted_window_levels[AppleWMNumWindowLevels+1] = {
-20, 21, 22, 23, 19, 18,
+static const int rooted_window_levels[AppleWMNumWindowLevels + 1] = {
+    20, 21, 22, 23, 19, 18,
 };
 
 #endif /* XPR_H */
diff --git a/xorg-server/hw/xquartz/xpr/xprAppleWM.c b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
index 77b9fa3e8..8c4f5efb8 100644
--- a/xorg-server/hw/xquartz/xpr/xprAppleWM.c
+++ b/xorg-server/hw/xquartz/xpr/xprAppleWM.c
@@ -1,7 +1,7 @@
 /*
  * Xplugin rootless implementation functions for AppleWM extension
  *
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002-2012 Apple Computer, Inc. All rights reserved.
  * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -107,7 +107,8 @@ xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent)
 
     RootlessStopDrawing(pWinChild, FALSE);
 
-    if (xp_configure_window(child_wid, XP_ATTACH_TRANSIENT, &wc) != Success) {
+    if (xp_configure_window(child_wid, XP_ATTACH_TRANSIENT,
+                            &wc) != Success) {
         return BadValue;
     }
 
@@ -119,9 +120,10 @@ static int
 xprFrameDraw(WindowPtr pWin,
              xp_frame_class class,
              xp_frame_attr attr,
-             const BoxRec * outer,
-             const BoxRec * inner,
-             unsigned int title_len, const unsigned char *title_bytes)
+             const BoxRec *outer,
+             const BoxRec *inner,
+             unsigned int title_len,
+             const unsigned char *title_bytes)
 {
     xp_window_id wid;
 
diff --git a/xorg-server/hw/xquartz/xpr/xprCursor.c b/xorg-server/hw/xquartz/xpr/xprCursor.c
index b0afa8c0e..0392a4639 100644
--- a/xorg-server/hw/xquartz/xpr/xprCursor.c
+++ b/xorg-server/hw/xquartz/xpr/xprCursor.c
@@ -57,11 +57,11 @@ typedef struct {
 } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
 
 static DevPrivateKeyRec darwinCursorScreenKeyRec;
-
 #define darwinCursorScreenKey (&darwinCursorScreenKeyRec)
 
 #define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
-    dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
+                              dixLookupPrivate(&pScreen->devPrivates, \
+                                               darwinCursorScreenKey))
 
 static Bool
 load_cursor(CursorPtr src, int screen)
@@ -89,11 +89,10 @@ load_cursor(CursorPtr src, int screen)
     if (src->bits->argb != NULL) {
 #if BITMAP_BIT_ORDER == MSBFirst
         rowbytes = src->bits->width * sizeof(CARD32);
-        data = (uint32_t *) src->bits->argb;
+        data = (uint32_t *)src->bits->argb;
 #else
-        const uint32_t *be_data = (uint32_t *) src->bits->argb;
+        const uint32_t *be_data = (uint32_t *)src->bits->argb;
         unsigned i;
-
         rowbytes = src->bits->width * sizeof(CARD32);
         data = malloc(rowbytes * src->bits->height);
         free_data = TRUE;
@@ -134,13 +133,15 @@ load_cursor(CursorPtr src, int screen)
             mrow = src->bits->mask;
             drow = data;
 
-            while (ycount-- > 0) {
+            while (ycount-- > 0)
+            {
                 xcount = bits_to_bytes(src->bits->width);
                 sptr = srow;
                 mptr = mrow;
                 dptr = drow;
 
-                while (xcount-- > 0) {
+                while (xcount-- > 0)
+                {
                     uint8_t s, m;
                     int i;
 
@@ -167,7 +168,7 @@ load_cursor(CursorPtr src, int screen)
 
                 srow += BitmapBytePad(src->bits->width);
                 mrow += BitmapBytePad(src->bits->width);
-                drow = (uint32_t *) ((char *) drow + rowbytes);
+                drow = (uint32_t *)((char *)drow + rowbytes);
             }
         }
         else {
@@ -182,12 +183,12 @@ load_cursor(CursorPtr src, int screen)
 }
 
 /*
-===========================================================================
+   ===========================================================================
 
- Pointer sprite functions
+   Pointer sprite functions
 
-===========================================================================
-*/
+   ===========================================================================
+ */
 
 /*
  * QuartzRealizeCursor
@@ -219,7 +220,8 @@ QuartzUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
  *  Set the cursor sprite and position.
  */
 static void
-QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
+QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
+                int x,
                 int y)
 {
     QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
@@ -249,16 +251,15 @@ QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
  */
 static void
 QuartzMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
-{
-}
+{}
 
 /*
-===========================================================================
+   ===========================================================================
 
- Pointer screen functions
+   Pointer screen functions
 
-===========================================================================
-*/
+   ===========================================================================
+ */
 
 /*
  * QuartzCursorOffScreen
@@ -309,12 +310,12 @@ static miPointerScreenFuncRec quartzScreenFuncsRec = {
 };
 
 /*
-===========================================================================
+   ===========================================================================
 
- Other screen functions
+   Other screen functions
 
-===========================================================================
-*/
+   ===========================================================================
+ */
 
 /*
  * QuartzCursorQueryBestSize
@@ -332,7 +333,7 @@ QuartzCursorQueryBestSize(int class, unsigned short *width,
         *height = 32;
     }
     else {
-        (*ScreenPriv->QueryBestSize) (class, width, height, pScreen);
+        (*ScreenPriv->QueryBestSize)(class, width, height, pScreen);
     }
 }
 
@@ -383,8 +384,7 @@ QuartzInitCursor(ScreenPtr pScreen)
  */
 void
 QuartzSuspendXCursor(ScreenPtr pScreen)
-{
-}
+{}
 
 /*
  * QuartzResumeXCursor
diff --git a/xorg-server/hw/xquartz/xpr/xprEvent.c b/xorg-server/hw/xquartz/xpr/xprEvent.c
index 7f4b077c3..106a91931 100644
--- a/xorg-server/hw/xquartz/xpr/xprEvent.c
+++ b/xorg-server/hw/xquartz/xpr/xprEvent.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 Apple Inc.
+/* Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -56,12 +56,13 @@
 #include "xprEvent.h"
 
 Bool
-QuartzModeEventHandler(int screenNum, XQuartzEvent * e, DeviceIntPtr dev)
+QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
 {
     switch (e->subtype) {
     case kXquartzWindowState:
         DEBUG_LOG("kXquartzWindowState\n");
-        RootlessNativeWindowStateChanged(xprGetXWindow(e->data[0]), e->data[1]);
+        RootlessNativeWindowStateChanged(xprGetXWindow(e->data[0]),
+                                         e->data[1]);
         return TRUE;
 
     case kXquartzWindowMoved:
@@ -73,6 +74,7 @@ QuartzModeEventHandler(int screenNum, XQuartzEvent * e, DeviceIntPtr dev)
         DEBUG_LOG("kXquartzBringAllToFront\n");
         RootlessOrderAllWindows(e->data[0]);
         return TRUE;
+
     default:
         return FALSE;
     }
diff --git a/xorg-server/hw/xquartz/xpr/xprEvent.h b/xorg-server/hw/xquartz/xpr/xprEvent.h
index ebfa36bd8..4f9cc6118 100644
--- a/xorg-server/hw/xquartz/xpr/xprEvent.h
+++ b/xorg-server/hw/xquartz/xpr/xprEvent.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 Apple Inc.
+/* Copyright (c) 2008-2012 Apple Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation files
@@ -29,6 +29,7 @@
 #ifndef __XPR_EVENT_H__
 #define __XPR_EVENT_H__
 
-Bool QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev);
+Bool
+QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev);
 
 #endif
diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index ed81c4b48..4c7aac42b 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -1,7 +1,7 @@
 /*
  * Xplugin rootless implementation frame functions
  *
- * Copyright (c) 2002-2011 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002-2012 Apple Computer, Inc. All rights reserved.
  * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -49,21 +49,21 @@
 #include <pthread.h>
 #endif
 
-#define DEFINE_ATOM_HELPER(func,atom_name)                      \
-static Atom func (void) {                                       \
-    static int generation;                                      \
-    static Atom atom;                                           \
-    if (generation != serverGeneration) {                       \
-        generation = serverGeneration;                          \
-        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \
-    }                                                           \
-    return atom;                                                \
-}
+#define DEFINE_ATOM_HELPER(func, atom_name)                      \
+    static Atom func(void) {                                       \
+        static int generation;                                      \
+        static Atom atom;                                           \
+        if (generation != serverGeneration) {                       \
+            generation = serverGeneration;                          \
+            atom = MakeAtom(atom_name, strlen(atom_name), TRUE);  \
+        }                                                           \
+        return atom;                                                \
+    }
 
 DEFINE_ATOM_HELPER(xa_native_window_id, "_NATIVE_WINDOW_ID")
 
 /* Maps xp_window_id -> RootlessWindowRec */
-static x_hash_table *window_hash;
+static x_hash_table * window_hash;
 
 /* Need to guard window_hash since xprIsX11Window can be called from any thread. */
 #ifdef HAVE_LIBDISPATCH
@@ -74,15 +74,16 @@ static pthread_rwlock_t window_hash_rwlock;
 
 /* Prototypes for static functions */
 static Bool
-xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
-               int newX, int newY, RegionPtr pShape);
+xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen, int newX,
+               int newY,
+               RegionPtr pShape);
 static void
 xprDestroyFrame(RootlessFrameID wid);
 static void
 xprMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
 static void
-xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
-               int newX, int newY, unsigned int newW, unsigned int newH,
+xprResizeFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY,
+               unsigned int newW, unsigned int newH,
                unsigned int gravity);
 static void
 xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid);
@@ -97,8 +98,9 @@ xprStopDrawing(RootlessFrameID wid, Bool flush);
 static void
 xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage);
 static void
-xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec * rects,
-               int shift_x, int shift_y);
+xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
+               int shift_x,
+               int shift_y);
 static void
 xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin);
 static Bool
@@ -108,12 +110,13 @@ xprHideWindow(RootlessFrameID wid);
 static void
 xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen);
 static void
-xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec * dstRects,
-              int dx, int dy);
+xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
+              int dx,
+              int dy);
 
 static inline xp_error
 xprConfigureWindow(xp_window_id id, unsigned int mask,
-                   const xp_window_changes * values)
+                   const xp_window_changes *values)
 {
     return xp_configure_window(id, mask, values);
 }
@@ -131,17 +134,18 @@ xprSetNativeProperty(RootlessWindowPtr pFrame)
 
         data = native_id;
         dixChangeWindowProperty(serverClient, pFrame->win,
-                                xa_native_window_id(), XA_INTEGER, 32,
-                                PropModeReplace, 1, &data, TRUE);
+                                xa_native_window_id(),
+                                XA_INTEGER, 32, PropModeReplace, 1, &data,
+                                TRUE);
     }
 }
 
 static xp_error
 xprColormapCallback(void *data, int first_color, int n_colors,
-                    uint32_t * colors)
+                    uint32_t *colors)
 {
-    return (RootlessResolveColormap(data, first_color, n_colors, colors) ?
-            XP_Success : XP_BadMatch);
+    return (RootlessResolveColormap(data, first_color, n_colors,
+                                    colors) ? XP_Success : XP_BadMatch);
 }
 
 /*
@@ -195,7 +199,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
         wc.window_level = rooted_window_levels[pFrame->level];
     mask |= XP_WINDOW_LEVEL;
 
-    err = xp_create_window(mask, &wc, (xp_window_id *) & pFrame->wid);
+    err = xp_create_window(mask, &wc, (xp_window_id *)&pFrame->wid);
 
     if (err != Success) {
         return FALSE;
@@ -203,8 +207,8 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
 
 #ifdef HAVE_LIBDISPATCH
     dispatch_async(window_hash_serial_q, ^ {
-                   x_hash_table_insert(window_hash, pFrame->wid, pFrame);}
-    );
+                       x_hash_table_insert(window_hash, pFrame->wid, pFrame);
+                   });
 #else
     pthread_rwlock_wrlock(&window_hash_rwlock);
     x_hash_table_insert(window_hash, pFrame->wid, pFrame);
@@ -226,7 +230,8 @@ xprDestroyFrame(RootlessFrameID wid)
 
 #ifdef HAVE_LIBDISPATCH
     dispatch_async(window_hash_serial_q, ^ {
-                   x_hash_table_remove(window_hash, wid);});
+                       x_hash_table_remove(window_hash, wid);
+                   });
 #else
     pthread_rwlock_wrlock(&window_hash_rwlock);
     x_hash_table_remove(window_hash, wid);
@@ -236,7 +241,8 @@ xprDestroyFrame(RootlessFrameID wid)
     err = xp_destroy_window(x_cvt_vptr_to_uint(wid));
     if (err != Success)
         FatalError("Could not destroy window %d (%d).",
-                   (int) x_cvt_vptr_to_uint(wid), (int) err);
+                   (int)x_cvt_vptr_to_uint(
+                       wid), (int)err);
 }
 
 /*
@@ -283,11 +289,10 @@ xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
 {
     xp_window_changes wc;
     unsigned int mask = XP_STACKING;
-
 #ifdef HAVE_LIBDISPATCH
     __block
 #endif
-        RootlessWindowRec * winRec;
+    RootlessWindowRec * winRec;
 
     /* Stack frame below nextWid it if it exists, or raise
        frame above everything otherwise. */
@@ -303,8 +308,8 @@ xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
 
 #ifdef HAVE_LIBDISPATCH
     dispatch_sync(window_hash_serial_q, ^ {
-                  winRec = x_hash_table_lookup(window_hash, wid, NULL);}
-    );
+                      winRec = x_hash_table_lookup(window_hash, wid, NULL);
+                  });
 #else
     pthread_rwlock_rdlock(&window_hash_rwlock);
     winRec = x_hash_table_lookup(window_hash, wid, NULL);
@@ -371,12 +376,12 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
     unsigned int rowbytes[2];
     xp_error err;
 
-    err =
-        xp_lock_window(x_cvt_vptr_to_uint(wid), NULL, NULL, data, rowbytes,
-                       NULL);
+    err = xp_lock_window(x_cvt_vptr_to_uint(
+                             wid), NULL, NULL, data, rowbytes, NULL);
     if (err != Success)
         FatalError("Could not lock window %d for drawing (%d).",
-                   (int) x_cvt_vptr_to_uint(wid), (int) err);
+                   (int)x_cvt_vptr_to_uint(
+                       wid), (int)err);
 
     *pixelData = data[0];
     *bytesPerRow = rowbytes[0];
@@ -396,7 +401,8 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
      */
     if (err != Success)
         ErrorF("Could not unlock window %d after drawing (%d).",
-               (int) x_cvt_vptr_to_uint(wid), (int) err);
+               (int)x_cvt_vptr_to_uint(
+                   wid), (int)err);
 }
 
 /*
@@ -412,7 +418,7 @@ xprUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)
  * Mark damaged rectangles as requiring redisplay to screen.
  */
 static void
-xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec * rects,
+xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
                int shift_x, int shift_y)
 {
     xp_mark_window(x_cvt_vptr_to_uint(wid), nrects, rects, shift_x, shift_y);
@@ -446,7 +452,7 @@ xprDoReorderWindow(RootlessWindowPtr pFrame)
  *  Used to accelerate scrolling.
  */
 static void
-xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec * dstRects,
+xprCopyWindow(RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
               int dx, int dy)
 {
     xp_copy_window(x_cvt_vptr_to_uint(wid), x_cvt_vptr_to_uint(wid),
@@ -487,8 +493,8 @@ xprInit(ScreenPtr pScreen)
     assert((window_hash = x_hash_table_new(NULL, NULL, NULL, NULL)));
 #ifdef HAVE_LIBDISPATCH
     assert((window_hash_serial_q =
-            dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.xpr_window_hash",
-                                  NULL)));
+                dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.xpr_window_hash",
+                                      NULL)));
 #else
     assert(0 == pthread_rwlock_init(&window_hash_rwlock, NULL));
 #endif
@@ -505,14 +511,13 @@ xprGetXWindow(xp_window_id wid)
 {
 #ifdef HAVE_LIBDISPATCH
     RootlessWindowRec *winRec __block;
-
     dispatch_sync(window_hash_serial_q, ^ {
-                  winRec =
-                  x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid),
-                                      NULL);});
+                      winRec =
+                          x_hash_table_lookup(window_hash,
+                                              x_cvt_uint_to_vptr(wid), NULL);
+                  });
 #else
     RootlessWindowRec *winRec;
-
     pthread_rwlock_rdlock(&window_hash_rwlock);
     winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL);
     pthread_rwlock_unlock(&window_hash_rwlock);
@@ -553,7 +558,6 @@ xprHideWindows(Bool hide)
 
     for (screen = 0; screen < screenInfo.numScreens; screen++) {
         RootlessFrameID prevWid = NULL;
-
         pRoot = screenInfo.screens[screen]->root;
 
         for (pWin = pRoot->firstChild; pWin; pWin = pWin->nextSib) {
@@ -583,13 +587,13 @@ xprHideWindows(Bool hide)
 }
 
 // XXX: identical to x_cvt_vptr_to_uint ?
-#define MAKE_WINDOW_ID(x)		((xp_window_id)((size_t)(x)))
+#define MAKE_WINDOW_ID(x) ((xp_window_id)((size_t)(x)))
 
 Bool no_configure_window;
 
 static inline int
 configure_window(xp_window_id id, unsigned int mask,
-                 const xp_window_changes * values)
+                 const xp_window_changes *values)
 {
     if (!no_configure_window)
         return xp_configure_window(id, mask, values);
@@ -598,12 +602,11 @@ configure_window(xp_window_id id, unsigned int mask,
 }
 
 static
-    void
+void
 xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen)
 {
     /* This is how we tell xp that the colormap may have changed. */
     xp_window_changes wc;
-
     wc.colormap = xprColormapCallback;
     wc.colormap_data = pScreen;
 
@@ -611,11 +614,10 @@ xprUpdateColormap(RootlessFrameID wid, ScreenPtr pScreen)
 }
 
 static
-    void
+void
 xprHideWindow(RootlessFrameID wid)
 {
     xp_window_changes wc;
-
     wc.stack_mode = XP_UNMAPPED;
     wc.sibling = 0;
     configure_window(MAKE_WINDOW_ID(wid), XP_STACKING, &wc);
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 185369e6b..efe2aa882 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -1,7 +1,7 @@
 /*
  * Xplugin rootless implementation screen functions
  *
- * Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2002-2012 Apple Computer, Inc. All Rights Reserved.
  * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -55,7 +55,7 @@
 #endif
 
 /* 10.4's deferred update makes X slower.. have to live with the tearing
-   for now.. */
+ * for now.. */
 #define XP_NO_DEFERRED_UPDATES 8
 
 // Name of GLX bundle for native OpenGL
@@ -81,9 +81,10 @@ eventHandler(unsigned int type, const void *arg,
             const xp_window_state_event *ws_arg = arg;
 
             DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n",
-                      ws_arg->id, ws_arg->state);
-            DarwinSendDDXEvent(kXquartzWindowState, 2, ws_arg->id,
-                               ws_arg->state);
+                      ws_arg->id,
+                      ws_arg->state);
+            DarwinSendDDXEvent(kXquartzWindowState, 2,
+                               ws_arg->id, ws_arg->state);
         }
         else {
             DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");
@@ -93,14 +94,14 @@ eventHandler(unsigned int type, const void *arg,
     case XP_EVENT_WINDOW_MOVED:
         DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
         if (arg_size == sizeof(xp_window_id)) {
-            xp_window_id id = *(xp_window_id *) arg;
-
+            xp_window_id id = *(xp_window_id *)arg;
             DarwinSendDDXEvent(kXquartzWindowMoved, 1, id);
         }
         break;
 
     case XP_EVENT_SURFACE_DESTROYED:
         DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
+
     case XP_EVENT_SURFACE_CHANGED:
         DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
         if (arg_size == sizeof(xp_surface_id)) {
@@ -111,18 +112,19 @@ eventHandler(unsigned int type, const void *arg,
             else
                 kind = AppleDRISurfaceNotifyChanged;
 
-            DRISurfaceNotify(*(xp_surface_id *) arg, kind);
+            DRISurfaceNotify(*(xp_surface_id *)arg, kind);
         }
         break;
+
 #ifdef XP_EVENT_SPACE_CHANGED
-    case XP_EVENT_SPACE_CHANGED:
+    case  XP_EVENT_SPACE_CHANGED:
         DEBUG_LOG("XP_EVENT_SPACE_CHANGED\n");
         if (arg_size == sizeof(uint32_t)) {
-            uint32_t space_id = *(uint32_t *) arg;
-
+            uint32_t space_id = *(uint32_t *)arg;
             DarwinSendDDXEvent(kXquartzSpaceChanged, 1, space_id);
         }
         break;
+
 #endif
     default:
         ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);
@@ -159,18 +161,19 @@ displayScreenBounds(CGDirectDisplayID id)
     frame = CGDisplayBounds(id);
 
     DEBUG_LOG("    %dx%d @ (%d,%d).\n",
-              (int) frame.size.width, (int) frame.size.height,
-              (int) frame.origin.x, (int) frame.origin.y);
+              (int)frame.size.width, (int)frame.size.height,
+              (int)frame.origin.x, (int)frame.origin.y);
 
     /* Remove menubar to help standard X11 window managers. */
-    if (XQuartzIsRootless && frame.origin.x == 0 && frame.origin.y == 0) {
+    if (XQuartzIsRootless &&
+        frame.origin.x == 0 && frame.origin.y == 0) {
         frame.origin.y += aquaMenuBarHeight;
         frame.size.height -= aquaMenuBarHeight;
     }
 
     DEBUG_LOG("    %dx%d @ (%d,%d).\n",
-              (int) frame.size.width, (int) frame.size.height,
-              (int) frame.origin.x, (int) frame.origin.y);
+              (int)frame.size.width, (int)frame.size.height,
+              (int)frame.origin.x, (int)frame.origin.y);
 
     return frame;
 }
@@ -190,11 +193,11 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height,
 
     // Find all the CoreGraphics displays
     CGGetActiveDisplayList(0, NULL, &displayCount);
-    DEBUG_LOG("displayCount: %d\n", (int) displayCount);
+    DEBUG_LOG("displayCount: %d\n", (int)displayCount);
 
     if (!displayCount) {
-        ErrorF
-            ("CoreGraphics has reported no connected displays.  Creating a stub 800x600 display.\n");
+        ErrorF(
+            "CoreGraphics has reported no connected displays.  Creating a stub 800x600 display.\n");
         *x = *y = 0;
         *width = 800;
         *height = 600;
@@ -219,7 +222,6 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height,
     /* Get the union of all screens */
     for (i = 0; i < displayCount; i++) {
         CGDirectDisplayID dpy = displayList[i];
-
         frame = displayScreenBounds(dpy);
         unionRect = CGRectUnion(unionRect, frame);
     }
@@ -242,7 +244,7 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height,
         frame.origin.y -= unionRect.origin.y;
 
         DEBUG_LOG("    placed at X11 coordinate (%d,%d).\n",
-                  (int) frame.origin.x, (int) frame.origin.y);
+                  (int)frame.origin.x, (int)frame.origin.y);
 
         PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
                              frame.size.width, frame.size.height);
@@ -276,12 +278,14 @@ xprDisplayInit(void)
         FatalError("Could not initialize the Xplugin library.");
 
     xp_select_events(XP_EVENT_DISPLAY_CHANGED
-                     | XP_EVENT_WINDOW_STATE_CHANGED | XP_EVENT_WINDOW_MOVED
+                     | XP_EVENT_WINDOW_STATE_CHANGED
+                     | XP_EVENT_WINDOW_MOVED
 #ifdef XP_EVENT_SPACE_CHANGED
                      | XP_EVENT_SPACE_CHANGED
 #endif
                      | XP_EVENT_SURFACE_CHANGED
-                     | XP_EVENT_SURFACE_DESTROYED, eventHandler, NULL);
+                     | XP_EVENT_SURFACE_DESTROYED,
+                     eventHandler, NULL);
 
     AppleDRIExtensionInit();
     xprAppleWMInit();
@@ -305,9 +309,8 @@ xprAddScreen(int index, ScreenPtr pScreen)
 
     if (depth == -1) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-        depth =
-            CGDisplaySamplesPerPixel(kCGDirectMainDisplay) *
-            CGDisplayBitsPerSample(kCGDirectMainDisplay);
+        depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) *
+                CGDisplayBitsPerSample(kCGDirectMainDisplay);
 #else
         CGDisplayModeRef modeRef;
         CFStringRef encStrRef;
@@ -321,19 +324,19 @@ xprAddScreen(int index, ScreenPtr pScreen)
         if (!encStrRef)
             goto have_depth;
 
-        if (CFStringCompare
-            (encStrRef, CFSTR(IO32BitDirectPixels),
-             kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        if (CFStringCompare(encStrRef, CFSTR(IO32BitDirectPixels),
+                            kCFCompareCaseInsensitive) ==
+            kCFCompareEqualTo) {
             depth = 24;
         }
-        else if (CFStringCompare
-                 (encStrRef, CFSTR(IO16BitDirectPixels),
-                  kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        else if (CFStringCompare(encStrRef, CFSTR(IO16BitDirectPixels),
+                                 kCFCompareCaseInsensitive) ==
+                 kCFCompareEqualTo) {
             depth = 15;
         }
-        else if (CFStringCompare
-                 (encStrRef, CFSTR(IO8BitIndexedPixels),
-                  kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        else if (CFStringCompare(encStrRef, CFSTR(IO8BitIndexedPixels),
+                                 kCFCompareCaseInsensitive) ==
+                 kCFCompareEqualTo) {
             depth = 8;
         }
 
@@ -342,10 +345,10 @@ xprAddScreen(int index, ScreenPtr pScreen)
     }
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
- have_depth:
+have_depth:
 #endif
     switch (depth) {
-    case 8:                    // pseudo-working
+    case 8:     // pseudo-working
         dfb->visuals = PseudoColorMask;
         dfb->preferredCVC = PseudoColor;
         dfb->depth = 8;
@@ -355,8 +358,9 @@ xprAddScreen(int index, ScreenPtr pScreen)
         dfb->greenMask = 0;
         dfb->blueMask = 0;
         break;
+
     case 15:
-        dfb->visuals = TrueColorMask;   //LARGE_VISUALS;
+        dfb->visuals = TrueColorMask;     //LARGE_VISUALS;
         dfb->preferredCVC = TrueColor;
         dfb->depth = 15;
         dfb->bitsPerRGB = 5;
@@ -365,13 +369,14 @@ xprAddScreen(int index, ScreenPtr pScreen)
         dfb->greenMask = GM_ARGB(0, 5, 5, 5);
         dfb->blueMask = BM_ARGB(0, 5, 5, 5);
         break;
-//        case 24:
+
+    //        case 24:
     default:
         if (depth != 24)
-            ErrorF
-                ("Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n",
-                 depth, darwinDesiredDepth);
-        dfb->visuals = TrueColorMask;   //LARGE_VISUALS;
+            ErrorF(
+                "Unsupported color depth requested.  Defaulting to 24bit. (depth=%d darwinDesiredDepth=%d)\n",
+                depth, darwinDesiredDepth);
+        dfb->visuals = TrueColorMask;     //LARGE_VISUALS;
         dfb->preferredCVC = TrueColor;
         dfb->depth = 24;
         dfb->bitsPerRGB = 8;
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index 4049e9735..a25307cb6 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -70,7 +70,7 @@ OsVendorVErrorF(const char *pszFormat, va_list va_args)
  * Attempt to do last-ditch, safe, important cleanup here.
  */
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
     /* Don't give duplicate warning if UseMsg was called */
     if (g_fSilentFatalError)
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index dd06a8578..166c60cd8 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -321,7 +321,7 @@ extern _X_EXPORT void
 OsCleanup(Bool);
 
 extern _X_EXPORT void
-OsVendorFatalError(void);
+OsVendorFatalError(const char *f, va_list args);
 
 extern _X_EXPORT void
 OsVendorInit(void);
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 1b1b28519..9a719696c 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -593,6 +593,7 @@ void
 FatalError(const char *f, ...)
 {
     va_list args;
+    va_list args2;
     static Bool beenhere = FALSE;
 
     if (beenhere)
@@ -600,22 +601,25 @@ FatalError(const char *f, ...)
     else
         ErrorF("\nFatal server error:\n");
 
-    va_start(args, f);
+    /* Make a copy for OsVendorFatalError */
+    va_copy(args2, args);
+
 #ifdef __APPLE__
     {
-        va_list args2;
+        va_list apple_args;
 
-        va_copy(args2, args);
-        (void) vsnprintf(__crashreporter_info_buff__,
-                         sizeof(__crashreporter_info_buff__), f, args2);
-        va_end(args2);
+        va_copy(apple_args, args);
+        (void)vsnprintf(__crashreporter_info_buff__,
+                        sizeof(__crashreporter_info_buff__), f, apple_args);
+        va_end(apple_args);
     }
 #endif
     VErrorF(f, args);
     va_end(args);
     ErrorF("\n");
     if (!beenhere)
-        OsVendorFatalError();
+        OsVendorFatalError(f, args2);
+    va_end(args2);
     if (!beenhere) {
         beenhere = TRUE;
         AbortServer();
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index b875b75f7..eb6147021 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -52,6 +52,9 @@ libxservertest_la_LIBADD += \
             $(top_builddir)/hw/xfree86/i2c/libi2c.la \
             $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
             @XORG_LIBS@
+
+EXTRA_DIST = ddxstubs.c
+
 else
 nodist_libxservertest_la_SOURCES = \
             ddxstubs.c \
diff --git a/xorg-server/test/ddxstubs.c b/xorg-server/test/ddxstubs.c
index a214b9637..3647dc556 100644
--- a/xorg-server/test/ddxstubs.c
+++ b/xorg-server/test/ddxstubs.c
@@ -50,7 +50,7 @@ OsVendorInit(void)
 }
 
 void
-OsVendorFatalError(void)
+OsVendorFatalError(const char *f, va_list args)
 {
 }