xserver xkeyboard-config mesa git update 5 dec 2011

97 files changed, 9137 insertions, 9131 deletions

diff --git a/mesalib/Makefile b/mesalib/Makefile
index d65d4c496..cf6555c78 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -112,8 +112,6 @@ linux \
 linux-i965 \
 linux-alpha \
 linux-alpha-static \
-linux-cell \
-linux-cell-debug \
 linux-debug \
 linux-dri \
 linux-dri-debug \
diff --git a/mesalib/common.py b/mesalib/common.py
index cfee1b5dc..5578f72af 100644
--- a/mesalib/common.py
+++ b/mesalib/common.py
@@ -83,7 +83,7 @@ def AddOptions(opts):
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', host_platform,
-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'cygwin', 'sunos', 'freebsd8')))
+											 allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8')))
 	opts.Add(BoolOption('embedded', 'embedded build', 'no'))
 	opts.Add('toolchain', 'compiler toolchain', default_toolchain)
 	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
index 98cd457a0..e2ca70af9 100644
--- a/mesalib/configs/darwin
+++ b/mesalib/configs/darwin
@@ -54,5 +54,5 @@ GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
 DRI_DIRS = swrast
-GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad failover
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad
 #GALLIUM_DRIVERS_DIRS += llvmpipe
diff --git a/mesalib/configs/default b/mesalib/configs/default
index 2b1bf9bef..33e5f024d 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -116,10 +116,10 @@ EGL_DRIVERS_DIRS = glx
 # gbm backends to build
 GBM_BACKEND_DIRS = dri
 
-# Gallium directories and 
+# Gallium directories and
 GALLIUM_DIRS = auxiliary drivers state_trackers
 GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 i965 svga r300 nvfx nv50 failover
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = sw sw/xlib
 GALLIUM_TARGET_DIRS = libgl-xlib
diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell
deleted file mode 100644
index 7f38da971..000000000
--- a/mesalib/configs/linux-cell
+++ /dev/null
@@ -1,71 +0,0 @@
-# linux-cell  (non-debug build)
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-cell
-
-
-# Omiting other gallium drivers:
-GALLIUM_DRIVERS_DIRS = cell softpipe trace rbug identity
-
-
-# Compiler and flags
-CC = ppu32-gcc
-CXX = ppu32-g++
-HOST_CC = gcc
-APP_CC = gcc
-APP_CXX = g++
-
-OPT_FLAGS = -O3
-
-# Cell SDK location
-## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below)
-#SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
-## For SDK 3.0:
-SDK = /opt/cell/sdk/usr
-
-
-
-COMMON_C_CPP_FLAGS = $(OPT_FLAGS) -Wall -Winline \
-	-fPIC -m32 -mabi=altivec -maltivec \
-	-I. -I$(SDK)/include \
-	-DGALLIUM_CELL $(DEFINES)
-
-CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99
-
-CXXFLAGS = $(COMMON_C_CPP_FLAGS)
-
-
-SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
-	gallium gallium/winsys gallium/targets glu
-
-# Build no traditional Mesa drivers:
-DRIVER_DIRS =
-
-
-MKDEP_OPTIONS = -fdepend -Y
-
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
-	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe2
-
-
-CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
-
-
-### SPU stuff
-
-SPU_CC = spu-gcc
-
-SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \
-	-I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \
-	-DSPU_MAIN_PARAM_LONG_LONG \
-	-include spu_intrinsics.h
-
-SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -lm
-
-SPU_AR = ppu-ar
-SPU_AR_FLAGS = -qcs
-
-SPU_EMBED = ppu32-embedspu
-SPU_EMBED_FLAGS = -m32
diff --git a/mesalib/configs/linux-cell-debug b/mesalib/configs/linux-cell-debug
deleted file mode 100644
index 42f3245ed..000000000
--- a/mesalib/configs/linux-cell-debug
+++ /dev/null
@@ -1,10 +0,0 @@
-# linux-cell-debug
-
-include $(TOP)/configs/linux-cell
-
-# just override name and OPT_FLAGS here:
-
-CONFIG_NAME = linux-cell-debug
-
-OPT_FLAGS = -g -DDEBUG
-
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index 44c0c3d1d..6990c3a7a 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -58,7 +58,7 @@ SRC_DIRS := glx egl $(SRC_DIRS)
 EGL_DRIVERS_DIRS = glx
 
 DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 svga/drm
+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
 GALLIUM_TARGET_DIRS = dri-vmwgfx
 GALLIUM_STATE_TRACKERS_DIRS = egl dri
 
diff --git a/mesalib/configs/linux-i965 b/mesalib/configs/linux-i965
deleted file mode 100644
index 7656a2adc..000000000
--- a/mesalib/configs/linux-i965
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for standalone mode i965 debug
-
-include $(TOP)/configs/linux-debug
-
-CONFIG_NAME = linux-i965
-
-GALLIUM_DRIVER_DIRS = i965
-GALLIUM_WINSYS_DIRS = drm/i965/xlib
-GALLIUM_TARGET_DIRS =
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 39d4e0f55..a4943e126 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -799,7 +799,7 @@ GLU_DIRS="sgi"
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_TARGET_DIRS=""
 GALLIUM_WINSYS_DIRS="sw"
-GALLIUM_DRIVERS_DIRS="failover galahad trace rbug noop identity"
+GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity"
 GALLIUM_STATE_TRACKERS_DIRS=""
 
 # build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled
@@ -1844,14 +1844,6 @@ if test "x$with_gallium_drivers" != x; then
             GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
             gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
             ;;
-        xi965)
-            PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
-            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965 softpipe"
-            if test "x$MESA_LLVM" = x1; then
-                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-            fi
-            gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
-            ;;
         xr300)
             gallium_require_llvm "Gallium R300"
             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
@@ -2019,12 +2011,6 @@ if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
     echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"
     echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"
     echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"
-   if echo "$GALLIUM_DRIVERS_DIRS" | grep i965 > /dev/null 2>&1; then
-      echo
-      echo "        WARNING: enabling i965 gallium driver"
-      echo "        the i965g driver is currently utterly broken, only for adventurous developers"
-      echo
-   fi
 else
     echo "        Gallium:         no"
 fi
diff --git a/mesalib/docs/cell.html b/mesalib/docs/cell.html
deleted file mode 100644
index 30626b60b..000000000
--- a/mesalib/docs/cell.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<HTML>
-
-<TITLE>Cell Driver</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<H1>Mesa/Gallium Cell Driver</H1>
-
-<p>
-The Mesa
-<a href="http://en.wikipedia.org/wiki/Cell_%28microprocessor%29" target="_parent">Cell</a>
-driver is part of the 
-<a href="http://wiki.freedesktop.org/wiki/Software/gallium" target="_parent">Gallium3D</a>
-architecture.
-Tungsten Graphics did the original implementation of the Cell driver.
-</p>
-
-
-<H2>Source Code</H2>
-
-<p>
-The latest Cell driver source code is on the master branch of the Mesa
-git repository.
-</p>
-<p>
-To build the driver you'll need the IBM Cell SDK (version 2.1 or 3.0).
-To use the driver you'll need a Cell system, such as a PS3 running Linux,
-or the Cell Simulator (untested, though).
-</p>
-
-<p>
-If using Cell SDK 2.1, see the configs/linux-cell file for some
-special changes.
-</p>
-
-<p>
-To compile the code, run <code>make linux-cell</code>.
-Or to build in debug mode, run <code>make linux-cell-debug</code>.
-</p>
-
-<p>
-To use the library, make sure your current directory is the top of the
-Mesa tree, then set <code>LD_LIBRARY_PATH</code> like this:
-<pre>
-  export LD_LIBRARY_PATH=$PWD/lib/gallium:$PWD/lib/
-</pre>
-
-<p>
-Verify that the Cell driver is being used by running
-<code>progs/xdemos/glxinfo</code> and looking for:
-<pre>
-  OpenGL renderer string: Gallium 0.3, Cell on Xlib
-</pre>
-
-
-<H2>Driver Implementation Summary</H2>
-
-<p>
-Rasterization is parallelized across the SPUs in a tiled-based manner.
-Batches of transformed triangles are sent to the SPUs (actually, pulled by from
-main memory by the SPUs).
-Each SPU loops over a set of 32x32-pixel screen tiles, rendering the triangles
-into each tile.
-Because of the limited SPU memory, framebuffer tiles are paged in/out of
-SPU local store as needed.
-Similarly, textures are tiled and brought into local store as needed.
-</p>
-
-
-<H2>Status</H2>
-
-<p>
-As of October 2008, the driver runs quite a few OpenGL demos.
-Features that work include:
-</p>
-<ul>
-<li>Point/line/triangle rendering, glDrawPixels
-<li>2D, NPOT and cube texture maps with nearest/linear/mipmap filtering
-<li>Dynamic SPU code generation for fragment shaders, but not complete
-<li>Dynamic SPU code generation for fragment ops (blend, Z-test, etc), but not complete
-<li>Dynamic PPU/PPC code generation for vertex shaders, but not complete
-</ul>
-<p>
-Performance has recently improved with the addition of PPC code generation
-for vertex shaders, but the code quality isn't too great yet.
-</p>
-<p>
-Another bottleneck is SwapBuffers.  It may be the limiting factor for
-many simple GL tests.
-</p>
-
-
-
-<H2>Debug Options</H2>
-
-<p>
-The CELL_DEBUG env var can be set to a comma-separated list of one or
-more of the following debug options:
-</p>
-<ul>
-<li><b>checker</b> - use a different background clear color for each SPU.
-   This lets you see which SPU is rendering which screen tiles.
-<li><b>sync</b> - wait/synchronize after each DMA transfer
-<li><b>asm</b> - print generated SPU assembly code to stdout
-<li><b>fragops</b> - emit fragment ops debug messages
-<li><b>fragopfallback</b> - don't use codegen for fragment ops
-<li><b>cmd</b> - print SPU commands as their received
-<li><b>cache</b> - print texture cache statistics when program exits
-</ul>
-<p>
-Note that some of these options may only work for linux-cell-debug builds.
-</p>
-
-<p>
-If the GALLIUM_NOPPC env var is set, PPC code generation will not be used
-and vertex shaders will be run with the TGSI interpreter.
-</p>
-<p>
-If the GALLIUM_NOCELL env var is set, the softpipe driver will be used
-intead of the Cell driver.
-This is useful for comparison/validation.
-</p>
-
-
-
-<H2>Contributing</H2>
-
-<p>
-If you're interested in contributing to the effort, familiarize yourself
-with the code, join the <a href="lists.html">mesa3d-dev mailing list</a>,
-and describe what you'd like to do.
-</p>
-
-
-</BODY>
-</HTML>
diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html
index 8882e7318..e3cea2a7c 100644
--- a/mesalib/docs/contents.html
+++ b/mesalib/docs/contents.html
@@ -78,8 +78,7 @@ a:visited {
 <li><a href="devinfo.html" target="MainFrame">Development Notes</a>
 <li><a href="sourcedocs.html" target="MainFrame">Source Documentation</a>
 <li><a href="subset.html" target="MainFrame">Mesa Subset Driver</a>
-<LI><A HREF="dispatch.html" target="MainFrame">GL Dispatch</A>
-<li><a href="cell.html" target="MainFrame">Cell Driver</A>
+<li><a HREF="dispatch.html" target="MainFrame">GL Dispatch</a>
 </ul>
 
 <b>Links</b>
diff --git a/mesalib/docs/news.html b/mesalib/docs/news.html
index 912849228..d6a2aa8e6 100644
--- a/mesalib/docs/news.html
+++ b/mesalib/docs/news.html
@@ -217,7 +217,7 @@ This is a bug-fix release.
 <h2>January 24, 2008</h2>
 
 <p>
-Added a new page describing the <a href="cell.html">Mesa Cell driver</a>.
+Added a new page describing the Mesa Cell driver.
 </p>
 
 
diff --git a/mesalib/docs/relnotes-7.12.html b/mesalib/docs/relnotes-7.12.html
index 74279a0e4..471bbdac7 100644
--- a/mesalib/docs/relnotes-7.12.html
+++ b/mesalib/docs/relnotes-7.12.html
@@ -46,6 +46,7 @@ tbd
 <li>GL_NV_fog_distance (all gallium drivers, nouveau classic)
 <li>GL_NV_primitive_restart (r600g)
 <li>GL_OES_EGL_image_external (gallium drivers)
+<li>GL_OES_compressed_ETC1_RGB8_texture (softpipe, llvmpipe)
 <li>ARB_texture_rgb10_a2ui (softpipe, r600g)
 <li>Many updates to the VMware svga Gallium driver
 </ul>
@@ -69,9 +70,12 @@ tbd
   desktop OpenGL, <tt>GL_COLOR_INDEX</tt> data can still be uploaded
   to a color (e.g., RGBA) texture.  However, the data cannot be stored
   internally as color-index.</li>
-<li>Removed support for GL_APPLE_client_storage extension.
+<li>Removed support for GL_APPLE_client_storage extension.</li>
 <li>Removed the classic Mesa r300 and r600 drivers, which are superseded
-  by the gallium drivers for this hardware.
+  by the gallium drivers for this hardware.</li>
+<li>Removed the dead Gallium i965, cell and failover drivers, which were
+  either broken and with nobody in sight to fix the situation or
+  deprecated.</li>
 </ul>
 
 
diff --git a/mesalib/docs/relnotes-7.5.html b/mesalib/docs/relnotes-7.5.html
index 56deca6a8..a25ca8efc 100644
--- a/mesalib/docs/relnotes-7.5.html
+++ b/mesalib/docs/relnotes-7.5.html
@@ -61,7 +61,7 @@ baa7a1e850b6e39bae58868fd0684004  MesaGLUT-7.5.tar.bz2
     <ul>
     <li>softpipe - a software/reference driver
     <li>i915 - Intel 915/945 driver
-    <li><a href="cell.html">Cell</a> - IBM/Sony/Toshiba Cell processor driver
+    <li>Cell - IBM/Sony/Toshiba Cell processor driver
     <li>nouveau (for NVIDIA GPUs) and R300 for (AMD/ATI R300).
         <b>PLEASE NOTE: these drivers are incomplete and still under development.
         It's probably NOT worthwhile to report any bugs unless you have patches.
diff --git a/mesalib/docs/sourcetree.html b/mesalib/docs/sourcetree.html
index 713e25b01..e26c653ab 100644
--- a/mesalib/docs/sourcetree.html
+++ b/mesalib/docs/sourcetree.html
@@ -86,9 +86,7 @@ each directory.
         interfaces
     <li><b>drivers</b> - Gallium3D device drivers
       <ul>
-      <li><b>cell</b> - Driver for Cell processor.
       <li><b>i915</b> - Driver for Intel i915/i945.
-      <li><b>i965</b> - Driver for Intel i965.
       <li><b>llvmpipe</b> - Software driver using LLVM for runtime code generation.
       <li><b>nv*</b> - Drivers for NVIDIA GPUs.
       <li><b>r300</b> - Driver for ATI/AMD R300.
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 9651925a4..3cebaf58d 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -113,11 +113,6 @@ def generate(env):
 
     # Toolchain
     platform = env['platform']
-    if env['toolchain'] == 'default':
-        if platform == 'winddk':
-            env['toolchain'] = 'winddk'
-        elif platform == 'wince':
-            env['toolchain'] = 'wcesdk'
     env.Tool(env['toolchain'])
 
     # Allow override compiler and specify additional flags from environment
@@ -281,7 +276,7 @@ def generate(env):
         ]
         if gcc:
             cppdefines += [('__MSVCRT_VERSION__', '0x0700')]
-        if msvc and env['toolchain'] != 'winddk':
+        if msvc:
             cppdefines += [
                 'VC_EXTRALEAN',
                 '_USE_MATH_DEFINES',
@@ -292,57 +287,8 @@ def generate(env):
             ]
         if env['build'] in ('debug', 'checked'):
             cppdefines += ['_DEBUG']
-    if env['toolchain'] == 'winddk':
-        # Mimic WINDDK's builtin flags. See also:
-        # - WINDDK's bin/makefile.new i386mk.inc for more info.
-        # - buildchk_wxp_x86.log files, generated by the WINDDK's build
-        # - http://alter.org.ua/docs/nt_kernel/vc8_proj/
-        if machine == 'x86':
-            cppdefines += ['_X86_', 'i386']
-        if machine == 'x86_64':
-            cppdefines += ['_AMD64_', 'AMD64']
-    if platform == 'winddk':
-        cppdefines += [
-            'STD_CALL',
-            ('CONDITION_HANDLING', '1'),
-            ('NT_INST', '0'),
-            ('WIN32', '100'),
-            ('_NT1X_', '100'),
-            ('WINNT', '1'),
-            ('_WIN32_WINNT', '0x0501'), # minimum required OS version
-            ('WINVER', '0x0501'),
-            ('_WIN32_IE', '0x0603'),
-            ('WIN32_LEAN_AND_MEAN', '1'),
-            ('DEVL', '1'),
-            ('__BUILDMACHINE__', 'WinDDK'),
-            ('FPO', '0'),
-        ]
-        if env['build'] in ('debug', 'checked'):
-            cppdefines += [('DBG', 1)]
-    if platform == 'wince':
-        cppdefines += [
-            '_CRT_SECURE_NO_DEPRECATE',
-            '_USE_32BIT_TIME_T',
-            'UNICODE',
-            '_UNICODE',
-            ('UNDER_CE', '600'),
-            ('_WIN32_WCE', '0x600'),
-            'WINCEOEM',
-            'WINCEINTERNAL',
-            'WIN32',
-            'STRICT',
-            'x86',
-            '_X86_',
-            'INTERNATIONAL',
-            ('INTLMSG_CODEPAGE', '1252'),
-        ]
     if platform == 'windows':
         cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_USER']
-    if platform == 'winddk':
-        cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_DISPLAY']
-    if platform == 'wince':
-        cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE']
-        cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE_OGL']
     if env['embedded']:
         cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED']
     env.Append(CPPDEFINES = cppdefines)
@@ -463,39 +409,6 @@ def generate(env):
             ccflags += [
                 # TODO
             ]
-        if platform == 'winddk':
-            ccflags += [
-                '/Zl', # omit default library name in .OBJ
-                '/Zp8', # 8bytes struct member alignment
-                '/Gy', # separate functions for linker
-                '/Gm-', # disable minimal rebuild
-                '/WX', # treat warnings as errors
-                '/Gz', # __stdcall Calling convention
-                '/GX-', # disable C++ EH
-                '/GR-', # disable C++ RTTI
-                '/GF', # enable read-only string pooling
-                '/G6', # optimize for PPro, P-II, P-III
-                '/Ze', # enable extensions
-                '/Gi-', # disable incremental compilation
-                '/QIfdiv-', # disable Pentium FDIV fix
-                '/hotpatch', # prepares an image for hotpatching.
-                #'/Z7', #enable old-style debug info
-            ]
-        if platform == 'wince':
-            # See also C:\WINCE600\public\common\oak\misc\makefile.def
-            ccflags += [
-                '/Zl', # omit default library name in .OBJ
-                '/GF', # enable read-only string pooling
-                '/GR-', # disable C++ RTTI
-                '/GS', # enable security checks
-                # Allow disabling language conformance to maintain backward compat
-                #'/Zc:wchar_t-', # don't force wchar_t as native type, instead of typedef
-                #'/Zc:forScope-', # don't enforce Standard C++ for scoping rules
-                #'/wd4867',
-                #'/wd4430',
-                #'/MT',
-                #'/U_MT',
-            ]
         # Automatic pdb generation
         # See http://scons.tigris.org/issues/show_bug.cgi?id=1656
         env.EnsureSConsVersion(0, 98, 0)
@@ -558,45 +471,6 @@ def generate(env):
             '/fixed:no',
             '/incremental:no',
         ]
-    if platform == 'winddk':
-        linkflags += [
-            '/merge:_PAGE=PAGE',
-            '/merge:_TEXT=.text',
-            '/section:INIT,d',
-            '/opt:ref',
-            '/opt:icf',
-            '/ignore:4198,4010,4037,4039,4065,4070,4078,4087,4089,4221',
-            '/incremental:no',
-            '/fullbuild',
-            '/release',
-            '/nodefaultlib',
-            '/wx',
-            '/debug',
-            '/debugtype:cv',
-            '/version:5.1',
-            '/osversion:5.1',
-            '/functionpadmin:5',
-            '/safeseh',
-            '/pdbcompress',
-            '/stack:0x40000,0x1000',
-            '/driver',
-            '/align:0x80',
-            '/subsystem:native,5.01',
-            '/base:0x10000',
-
-            '/entry:DrvEnableDriver',
-        ]
-        if env['build'] != 'release':
-            linkflags += [
-                '/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx
-            ]
-    if platform == 'wince':
-        linkflags += [
-            '/nodefaultlib',
-            #'/incremental:no',
-            #'/fullbuild',
-            '/entry:_DllMainCRTStartup',
-        ]
     env.Append(LINKFLAGS = linkflags)
     env.Append(SHLINKFLAGS = shlinkflags)
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_atomic.h b/mesalib/src/gallium/auxiliary/util/u_atomic.h
index e8c0fdf75..2f2b42b34 100644
--- a/mesalib/src/gallium/auxiliary/util/u_atomic.h
+++ b/mesalib/src/gallium/auxiliary/util/u_atomic.h
@@ -1,352 +1,349 @@
-/**

- * Many similar implementations exist. See for example libwsbm

- * or the linux kernel include/atomic.h

- *

- * No copyright claimed on this file.

- *

- */

-

-#ifndef U_ATOMIC_H

-#define U_ATOMIC_H

-

-#include "pipe/p_compiler.h"

-#include "pipe/p_defines.h"

-

-/* Favor OS-provided implementations.

- *

- * Where no OS-provided implementation is available, fall back to

- * locally coded assembly, compiler intrinsic or ultimately a

- * mutex-based implementation.

- */

-#if (defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || \

-     defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT))

-#define PIPE_ATOMIC_OS_UNLOCKED

-#elif defined(PIPE_OS_SOLARIS)

-#define PIPE_ATOMIC_OS_SOLARIS

-#elif defined(PIPE_CC_MSVC)

-#define PIPE_ATOMIC_MSVC_INTRINSIC

-#elif (defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86))

-#define PIPE_ATOMIC_ASM_MSVC_X86                

-#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86))

-#define PIPE_ATOMIC_ASM_GCC_X86

-#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86_64))

-#define PIPE_ATOMIC_ASM_GCC_X86_64

-#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)

-#define PIPE_ATOMIC_GCC_INTRINSIC

-#else

-#error "Unsupported platform"

-#endif

-

-

-#if defined(PIPE_ATOMIC_ASM_GCC_X86_64)

-#define PIPE_ATOMIC "GCC x86_64 assembly"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-

-static INLINE boolean

-p_atomic_dec_zero(int32_t *v)

-{

-   unsigned char c;

-

-   __asm__ __volatile__("lock; decl %0; sete %1":"+m"(*v), "=qm"(c)

-			::"memory");

-

-   return c != 0;

-}

-

-static INLINE void

-p_atomic_inc(int32_t *v)

-{

-   __asm__ __volatile__("lock; incl %0":"+m"(*v));

-}

-

-static INLINE void

-p_atomic_dec(int32_t *v)

-{

-   __asm__ __volatile__("lock; decl %0":"+m"(*v));

-}

-

-static INLINE int32_t

-p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)

-{

-   return __sync_val_compare_and_swap(v, old, _new);

-}

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* PIPE_ATOMIC_ASM_GCC_X86_64 */

-

-

-#if defined(PIPE_ATOMIC_ASM_GCC_X86)

-

-#define PIPE_ATOMIC "GCC x86 assembly"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-

-static INLINE boolean

-p_atomic_dec_zero(int32_t *v)

-{

-   unsigned char c;

-

-   __asm__ __volatile__("lock; decl %0; sete %1":"+m"(*v), "=qm"(c)

-			::"memory");

-

-   return c != 0;

-}

-

-static INLINE void

-p_atomic_inc(int32_t *v)

-{

-   __asm__ __volatile__("lock; incl %0":"+m"(*v));

-}

-

-static INLINE void

-p_atomic_dec(int32_t *v)

-{

-   __asm__ __volatile__("lock; decl %0":"+m"(*v));

-}

-

-static INLINE int32_t

-p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)

-{

-   return __sync_val_compare_and_swap(v, old, _new);

-}

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-

-

-/* Implementation using GCC-provided synchronization intrinsics

- */

-#if defined(PIPE_ATOMIC_GCC_INTRINSIC)

-

-#define PIPE_ATOMIC "GCC Sync Intrinsics"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-

-static INLINE boolean

-p_atomic_dec_zero(int32_t *v)

-{

-   return (__sync_sub_and_fetch(v, 1) == 0);

-}

-

-static INLINE void

-p_atomic_inc(int32_t *v)

-{

-   (void) __sync_add_and_fetch(v, 1);

-}

-

-static INLINE void

-p_atomic_dec(int32_t *v)

-{

-   (void) __sync_sub_and_fetch(v, 1);

-}

-

-static INLINE int32_t

-p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)

-{

-   return __sync_val_compare_and_swap(v, old, _new);

-}

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-

-

-/* Unlocked version for single threaded environments, such as some

- * windows kernel modules.

- */

-#if defined(PIPE_ATOMIC_OS_UNLOCKED) 

-

-#define PIPE_ATOMIC "Unlocked"

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-#define p_atomic_dec_zero(_v) ((boolean) --(*(_v)))

-#define p_atomic_inc(_v) ((void) (*(_v))++)

-#define p_atomic_dec(_v) ((void) (*(_v))--)

-#define p_atomic_cmpxchg(_v, old, _new) (*(_v) == old ? *(_v) = (_new) : *(_v))

-

-#endif

-

-

-/* Locally coded assembly for MSVC on x86:

- */

-#if defined(PIPE_ATOMIC_ASM_MSVC_X86)

-

-#define PIPE_ATOMIC "MSVC x86 assembly"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-

-static INLINE boolean

-p_atomic_dec_zero(int32_t *v)

-{

-   unsigned char c;

-

-   __asm {

-      mov       eax, [v]

-      lock dec  dword ptr [eax]

-      sete      byte ptr [c]

-   }

-

-   return c != 0;

-}

-

-static INLINE void

-p_atomic_inc(int32_t *v)

-{

-   __asm {

-      mov       eax, [v]

-      lock inc  dword ptr [eax]

-   }

-}

-

-static INLINE void

-p_atomic_dec(int32_t *v)

-{

-   __asm {

-      mov       eax, [v]

-      lock dec  dword ptr [eax]

-   }

-}

-

-static INLINE int32_t

-p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)

-{

-   int32_t orig;

-

-   __asm {

-      mov ecx, [v]

-      mov eax, [old]

-      mov edx, [_new]

-      lock cmpxchg [ecx], edx

-      mov [orig], eax

-   }

-

-   return orig;

-}

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-

-#if defined(PIPE_ATOMIC_MSVC_INTRINSIC)

-

-#define PIPE_ATOMIC "MSVC Intrinsics"

-

-#include <intrin.h>

-

-#pragma intrinsic(_InterlockedIncrement)

-#pragma intrinsic(_InterlockedDecrement)

-#pragma intrinsic(_InterlockedCompareExchange)

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-

-static INLINE boolean

-p_atomic_dec_zero(int32_t *v)

-{

-   return _InterlockedDecrement((long *)v) == 0;

-}

-

-static INLINE void

-p_atomic_inc(int32_t *v)

-{

-   _InterlockedIncrement((long *)v);

-}

-

-static INLINE void

-p_atomic_dec(int32_t *v)

-{

-   _InterlockedDecrement((long *)v);

-}

-

-static INLINE int32_t

-p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)

-{

-   return _InterlockedCompareExchange((long *)v, _new, old);

-}

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-#if defined(PIPE_ATOMIC_OS_SOLARIS)

-

-#define PIPE_ATOMIC "Solaris OS atomic functions"

-

-#include <atomic.h>

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define p_atomic_set(_v, _i) (*(_v) = (_i))

-#define p_atomic_read(_v) (*(_v))

-

-static INLINE boolean

-p_atomic_dec_zero(int32_t *v)

-{

-   uint32_t n = atomic_dec_32_nv((uint32_t *) v);

-

-   return n != 0;

-}

-

-#define p_atomic_inc(_v) atomic_inc_32((uint32_t *) _v)

-#define p_atomic_dec(_v) atomic_dec_32((uint32_t *) _v)

-

-#define p_atomic_cmpxchg(_v, _old, _new) \

-	atomic_cas_32( (uint32_t *) _v, (uint32_t) _old, (uint32_t) _new)

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-

-#ifndef PIPE_ATOMIC

-#error "No pipe_atomic implementation selected"

-#endif

-

-

-

-#endif /* U_ATOMIC_H */

+/**
+ * Many similar implementations exist. See for example libwsbm
+ * or the linux kernel include/atomic.h
+ *
+ * No copyright claimed on this file.
+ *
+ */
+
+#ifndef U_ATOMIC_H
+#define U_ATOMIC_H
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_defines.h"
+
+/* Favor OS-provided implementations.
+ *
+ * Where no OS-provided implementation is available, fall back to
+ * locally coded assembly, compiler intrinsic or ultimately a
+ * mutex-based implementation.
+ */
+#if defined(PIPE_OS_SOLARIS)
+#define PIPE_ATOMIC_OS_SOLARIS
+#elif defined(PIPE_CC_MSVC)
+#define PIPE_ATOMIC_MSVC_INTRINSIC
+#elif (defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86))
+#define PIPE_ATOMIC_ASM_MSVC_X86                
+#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86))
+#define PIPE_ATOMIC_ASM_GCC_X86
+#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86_64))
+#define PIPE_ATOMIC_ASM_GCC_X86_64
+#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)
+#define PIPE_ATOMIC_GCC_INTRINSIC
+#else
+#error "Unsupported platform"
+#endif
+
+
+#if defined(PIPE_ATOMIC_ASM_GCC_X86_64)
+#define PIPE_ATOMIC "GCC x86_64 assembly"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   unsigned char c;
+
+   __asm__ __volatile__("lock; decl %0; sete %1":"+m"(*v), "=qm"(c)
+			::"memory");
+
+   return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   __asm__ __volatile__("lock; incl %0":"+m"(*v));
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   __asm__ __volatile__("lock; decl %0":"+m"(*v));
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(v, old, _new);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPE_ATOMIC_ASM_GCC_X86_64 */
+
+
+#if defined(PIPE_ATOMIC_ASM_GCC_X86)
+
+#define PIPE_ATOMIC "GCC x86 assembly"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   unsigned char c;
+
+   __asm__ __volatile__("lock; decl %0; sete %1":"+m"(*v), "=qm"(c)
+			::"memory");
+
+   return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   __asm__ __volatile__("lock; incl %0":"+m"(*v));
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   __asm__ __volatile__("lock; decl %0":"+m"(*v));
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(v, old, _new);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
+/* Implementation using GCC-provided synchronization intrinsics
+ */
+#if defined(PIPE_ATOMIC_GCC_INTRINSIC)
+
+#define PIPE_ATOMIC "GCC Sync Intrinsics"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   return (__sync_sub_and_fetch(v, 1) == 0);
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   (void) __sync_add_and_fetch(v, 1);
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   (void) __sync_sub_and_fetch(v, 1);
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(v, old, _new);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+
+/* Unlocked version for single threaded environments, such as some
+ * windows kernel modules.
+ */
+#if defined(PIPE_ATOMIC_OS_UNLOCKED) 
+
+#define PIPE_ATOMIC "Unlocked"
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+#define p_atomic_dec_zero(_v) ((boolean) --(*(_v)))
+#define p_atomic_inc(_v) ((void) (*(_v))++)
+#define p_atomic_dec(_v) ((void) (*(_v))--)
+#define p_atomic_cmpxchg(_v, old, _new) (*(_v) == old ? *(_v) = (_new) : *(_v))
+
+#endif
+
+
+/* Locally coded assembly for MSVC on x86:
+ */
+#if defined(PIPE_ATOMIC_ASM_MSVC_X86)
+
+#define PIPE_ATOMIC "MSVC x86 assembly"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   unsigned char c;
+
+   __asm {
+      mov       eax, [v]
+      lock dec  dword ptr [eax]
+      sete      byte ptr [c]
+   }
+
+   return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   __asm {
+      mov       eax, [v]
+      lock inc  dword ptr [eax]
+   }
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   __asm {
+      mov       eax, [v]
+      lock dec  dword ptr [eax]
+   }
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   int32_t orig;
+
+   __asm {
+      mov ecx, [v]
+      mov eax, [old]
+      mov edx, [_new]
+      lock cmpxchg [ecx], edx
+      mov [orig], eax
+   }
+
+   return orig;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+#if defined(PIPE_ATOMIC_MSVC_INTRINSIC)
+
+#define PIPE_ATOMIC "MSVC Intrinsics"
+
+#include <intrin.h>
+
+#pragma intrinsic(_InterlockedIncrement)
+#pragma intrinsic(_InterlockedDecrement)
+#pragma intrinsic(_InterlockedCompareExchange)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   return _InterlockedDecrement((long *)v) == 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+   _InterlockedIncrement((long *)v);
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+   _InterlockedDecrement((long *)v);
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+   return _InterlockedCompareExchange((long *)v, _new, old);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#if defined(PIPE_ATOMIC_OS_SOLARIS)
+
+#define PIPE_ATOMIC "Solaris OS atomic functions"
+
+#include <atomic.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+   uint32_t n = atomic_dec_32_nv((uint32_t *) v);
+
+   return n != 0;
+}
+
+#define p_atomic_inc(_v) atomic_inc_32((uint32_t *) _v)
+#define p_atomic_dec(_v) atomic_dec_32((uint32_t *) _v)
+
+#define p_atomic_cmpxchg(_v, _old, _new) \
+	atomic_cas_32( (uint32_t *) _v, (uint32_t) _old, (uint32_t) _new)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+#ifndef PIPE_ATOMIC
+#error "No pipe_atomic implementation selected"
+#endif
+
+
+
+#endif /* U_ATOMIC_H */
diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.c b/mesalib/src/gallium/auxiliary/util/u_debug.c
index 2d6193039..df1d8e68c 100644
--- a/mesalib/src/gallium/auxiliary/util/u_debug.c
+++ b/mesalib/src/gallium/auxiliary/util/u_debug.c
@@ -30,7 +30,6 @@
 #include "pipe/p_config.h" 
 
 #include "pipe/p_compiler.h"
-#include "os/os_stream.h"
 #include "util/u_debug.h" 
 #include "pipe/p_format.h" 
 #include "pipe/p_state.h" 
@@ -43,6 +42,7 @@
 #include "util/u_prim.h"
 #include "util/u_surface.h"
 
+#include <stdio.h>
 #include <limits.h> /* CHAR_BIT */
 #include <ctype.h> /* isalnum */
 
@@ -274,11 +274,7 @@ void _debug_assert_fail(const char *expr,
                         const char *function) 
 {
    _debug_printf("%s:%u:%s: Assertion `%s' failed.\n", file, line, function, expr);
-#if defined(PIPE_OS_WINDOWS) && !defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", FALSE))
-#else
    if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", TRUE))
-#endif
       os_abort();
    else
       _debug_printf("continuing...\n");
@@ -453,42 +449,6 @@ void debug_dump_image(const char *prefix,
                       unsigned stride,
                       const void *data)     
 {
-#ifdef PIPE_SUBSYSTEM_WINDOWS_DISPLAY
-   static unsigned no = 0; 
-   char filename[256];
-   WCHAR wfilename[sizeof(filename)];
-   ULONG_PTR iFile = 0;
-   struct {
-      unsigned format;
-      unsigned cpp;
-      unsigned width;
-      unsigned height;
-   } header;
-   unsigned char *pMap = NULL;
-   unsigned i;
-
-   util_snprintf(filename, sizeof(filename), "\\??\\c:\\%03u%s.raw", ++no, prefix);
-   for(i = 0; i < sizeof(filename); ++i)
-      wfilename[i] = (WCHAR)filename[i];
-   
-   pMap = (unsigned char *)EngMapFile(wfilename, sizeof(header) + height*width*cpp, &iFile);
-   if(!pMap)
-      return;
-   
-   header.format = format;
-   header.cpp = cpp;
-   header.width = width;
-   header.height = height;
-   memcpy(pMap, &header, sizeof(header));
-   pMap += sizeof(header);
-   
-   for(i = 0; i < height; ++i) {
-      memcpy(pMap, (unsigned char *)data + stride*i, cpp*width);
-      pMap += cpp*width;
-   }
-      
-   EngUnmapFile(iFile);
-#elif defined(PIPE_OS_UNIX)
    /* write a ppm file */
    char filename[256];
    FILE *f;
@@ -534,7 +494,6 @@ void debug_dump_image(const char *prefix,
    else {
       fprintf(stderr, "Can't open %s for writing\n", filename);
    }
-#endif
 }
 
 /* FIXME: dump resources, not surfaces... */
@@ -636,7 +595,6 @@ debug_dump_surface_bmp(struct pipe_context *pipe,
                        const char *filename,
                        struct pipe_surface *surface)
 {
-#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT
    struct pipe_transfer *transfer;
    struct pipe_resource *texture = surface->texture;
 
@@ -647,7 +605,6 @@ debug_dump_surface_bmp(struct pipe_context *pipe,
    debug_dump_transfer_bmp(pipe, filename, transfer);
 
    pipe->transfer_destroy(pipe, transfer);
-#endif
 }
 
 void
@@ -655,7 +612,6 @@ debug_dump_transfer_bmp(struct pipe_context *pipe,
                         const char *filename,
                         struct pipe_transfer *transfer)
 {
-#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT
    float *rgba;
 
    if (!transfer)
@@ -679,7 +635,6 @@ debug_dump_transfer_bmp(struct pipe_context *pipe,
    FREE(rgba);
 error1:
    ;
-#endif
 }
 
 void
@@ -687,8 +642,7 @@ debug_dump_float_rgba_bmp(const char *filename,
                           unsigned width, unsigned height,
                           float *rgba, unsigned stride)
 {
-#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT
-   struct os_stream *stream;
+   FILE *stream;
    struct bmp_file_header bmfh;
    struct bmp_info_header bmih;
    unsigned x, y;
@@ -714,12 +668,12 @@ debug_dump_float_rgba_bmp(const char *filename,
    bmih.biClrUsed = 0;
    bmih.biClrImportant = 0;
 
-   stream = os_file_stream_create(filename);
+   stream = fopen(filename, "wb");
    if(!stream)
       goto error1;
 
-   os_stream_write(stream, &bmfh, 14);
-   os_stream_write(stream, &bmih, 40);
+   fwrite(&bmfh, 14, 1, stream);
+   fwrite(&bmih, 40, 1, stream);
 
    y = height;
    while(y--) {
@@ -731,14 +685,13 @@ debug_dump_float_rgba_bmp(const char *filename,
          pixel.rgbGreen = float_to_ubyte(ptr[x*4 + 1]);
          pixel.rgbBlue  = float_to_ubyte(ptr[x*4 + 2]);
          pixel.rgbAlpha = float_to_ubyte(ptr[x*4 + 3]);
-         os_stream_write(stream, &pixel, 4);
+         fwrite(&pixel, 1, 4, stream);
       }
    }
 
-   os_stream_close(stream);
+   fclose(stream);
 error1:
    ;
-#endif
 }
 
 #endif
diff --git a/mesalib/src/gallium/auxiliary/util/u_debug_refcnt.c b/mesalib/src/gallium/auxiliary/util/u_debug_refcnt.c
index b3e389408..a51b4c55f 100644
--- a/mesalib/src/gallium/auxiliary/util/u_debug_refcnt.c
+++ b/mesalib/src/gallium/auxiliary/util/u_debug_refcnt.c
@@ -24,11 +24,14 @@
  *
  **************************************************************************/
 
-#if defined(DEBUG) && (!defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_WINDOWS_USER))
+#if defined(DEBUG)
 
 /* see http://www.mozilla.org/performance/refcnt-balancer.html for what do with the output
  * on Linux, use tools/addr2line.sh to postprocess it before anything else
  **/
+
+#include <stdio.h>
+
 #include "util/u_debug.h"
 #include "util/u_debug_refcnt.h"
 #include "util/u_debug_stack.h"
@@ -36,11 +39,10 @@
 #include "util/u_string.h"
 #include "util/u_hash_table.h"
 #include "os/os_thread.h"
-#include "os/os_stream.h"
 
 int debug_refcnt_state;
 
-struct os_stream* stream;
+FILE* stream;
 
 /* TODO: maybe move this serial machinery to a stand-alone module and expose it? */
 pipe_static_mutex(serials_mutex);
@@ -115,9 +117,9 @@ static void dump_stack(const char* symbols[STACK_LEN])
    for(i = 0; i < STACK_LEN; ++i)
    {
       if(symbols[i])
-         os_stream_printf(stream, "%s\n", symbols[i]);
+         fprintf(stream, "%s\n", symbols[i]);
    }
-   os_stream_write(stream, "\n", 1);
+   fprintf(stream, "\n");
 }
 
 void debug_reference_slowpath(const struct pipe_reference* p, debug_reference_descriptor get_desc, int change)
@@ -129,7 +131,7 @@ void debug_reference_slowpath(const struct pipe_reference* p, debug_reference_de
    {
       const char* filename = debug_get_option("GALLIUM_REFCNT_LOG", NULL);
       if(filename && filename[0])
-         stream = os_file_stream_create(filename);
+         stream = fopen(filename, "wt");
 
       if(stream)
          debug_refcnt_state = 1;
@@ -161,31 +163,33 @@ void debug_reference_slowpath(const struct pipe_reference* p, debug_reference_de
 
       if(!existing)
       {
-         os_stream_printf(stream, "<%s> %p %u Create\n", buf, p, serial);
+         fprintf(stream, "<%s> %p %u Create\n", buf, (void *) p, serial);
          dump_stack(symbols);
 
          /* this is there to provide a gradual change even if we don't see the initialization */
          for(i = 1; i <= refcnt - change; ++i)
          {
-            os_stream_printf(stream, "<%s> %p %u AddRef %u\n", buf, p, serial, i);
+            fprintf(stream, "<%s> %p %u AddRef %u\n", buf, (void *) p,
+                    serial, i);
             dump_stack(symbols);
          }
       }
 
       if(change)
       {
-         os_stream_printf(stream, "<%s> %p %u %s %u\n", buf, p, serial, change > 0 ? "AddRef" : "Release", refcnt);
+         fprintf(stream, "<%s> %p %u %s %u\n", buf, (void *) p, serial,
+                 change > 0 ? "AddRef" : "Release", refcnt);
          dump_stack(symbols);
       }
 
       if(!refcnt)
       {
          debug_serial_delete((void*)p);
-         os_stream_printf(stream, "<%s> %p %u Destroy\n", buf, p, serial);
+         fprintf(stream, "<%s> %p %u Destroy\n", buf, (void *) p, serial);
          dump_stack(symbols);
       }
 
-      os_stream_flush(stream);
+      fflush(stream);
    }
 }
 #endif
diff --git a/mesalib/src/gallium/auxiliary/util/u_dump.h b/mesalib/src/gallium/auxiliary/util/u_dump.h
index 7d89db163..3890b3bdd 100644
--- a/mesalib/src/gallium/auxiliary/util/u_dump.h
+++ b/mesalib/src/gallium/auxiliary/util/u_dump.h
@@ -1,179 +1,173 @@
-/**************************************************************************

- * 

- * Copyright 2009 VMware, Inc.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, 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 VMWARE 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.

- * 

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

-

-/**

- * @file

- * Dump data in human/machine readable format.

- * 

- * @author Jose Fonseca <jfonseca@vmware.com>

- */

-

-#ifndef U_DEBUG_DUMP_H_

-#define U_DEBUG_DUMP_H_

-

-

-#include "pipe/p_compiler.h"

-#include "pipe/p_state.h"

-

-

-#ifdef	__cplusplus

-extern "C" {

-#endif

-

-

-#define UTIL_DUMP_INVALID_NAME "<invalid>"

-

-

-struct os_stream;

-

-

-/* Duplicated here for convenience */

-extern struct os_stream *

-os_log_stream;

-

-

-/*

- * p_defines.h

- *

- * XXX: These functions don't really dump anything -- just translate into

- * strings so a verb better than "dump" should be used instead, in order to

- * free up the namespace to the true dumper functions.

- */

-

-const char *

-util_dump_blend_factor(unsigned value, boolean shortened);

-

-const char *

-util_dump_blend_func(unsigned value, boolean shortened);

-

-const char *

-util_dump_logicop(unsigned value, boolean shortened);

-

-const char *

-util_dump_func(unsigned value, boolean shortened);

-

-const char *

-util_dump_stencil_op(unsigned value, boolean shortened);

-

-const char *

-util_dump_tex_target(unsigned value, boolean shortened);

-

-const char *

-util_dump_tex_wrap(unsigned value, boolean shortened);

-

-const char *

-util_dump_tex_mipfilter(unsigned value, boolean shortened);

-

-const char *

-util_dump_tex_filter(unsigned value, boolean shortened);

-

-

-/*

- * p_state.h, through an os_stream

- */

-

-void

-util_dump_template(struct os_stream *stream,

-                   const struct pipe_resource *templat);

-

-void

-util_dump_rasterizer_state(struct os_stream *stream,

-                           const struct pipe_rasterizer_state *state);

-

-void

-util_dump_poly_stipple(struct os_stream *stream,

-                       const struct pipe_poly_stipple *state);

-

-void

-util_dump_viewport_state(struct os_stream *stream,

-                         const struct pipe_viewport_state *state);

-

-void

-util_dump_scissor_state(struct os_stream *stream,

-                        const struct pipe_scissor_state *state);

-

-void

-util_dump_clip_state(struct os_stream *stream,

-                     const struct pipe_clip_state *state);

-

-void

-util_dump_shader_state(struct os_stream *stream,

-                       const struct pipe_shader_state *state);

-

-void

-util_dump_depth_stencil_alpha_state(struct os_stream *stream,

-                                    const struct pipe_depth_stencil_alpha_state *state);

-

-void

-util_dump_rt_blend_state(struct os_stream *stream,

-                         const struct pipe_rt_blend_state *state);

-

-void

-util_dump_blend_state(struct os_stream *stream,

-                      const struct pipe_blend_state *state);

-

-void

-util_dump_blend_color(struct os_stream *stream,

-                      const struct pipe_blend_color *state);

-

-void

-util_dump_stencil_ref(struct os_stream *stream,

-                      const struct pipe_stencil_ref *state);

-

-void

-util_dump_framebuffer_state(struct os_stream *stream,

-                            const struct pipe_framebuffer_state *state);

-

-void

-util_dump_sampler_state(struct os_stream *stream,

-                        const struct pipe_sampler_state *state);

-

-void

-util_dump_surface(struct os_stream *stream,

-                  const struct pipe_surface *state);

-

-void

-util_dump_transfer(struct os_stream *stream,

-                   const struct pipe_transfer *state);

-

-void

-util_dump_vertex_buffer(struct os_stream *stream,

-                        const struct pipe_vertex_buffer *state);

-

-void

-util_dump_vertex_element(struct os_stream *stream,

-                         const struct pipe_vertex_element *state);

-

-

-/* FIXME: Move the other debug_dump_xxx functions out of u_debug.h into here. */

-

-

-#ifdef	__cplusplus

-}

-#endif

-

-#endif /* U_DEBUG_H_ */

+/**************************************************************************
+ * 
+ * Copyright 2009 VMware, Inc.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, 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 VMWARE 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.
+ * 
+ **************************************************************************/
+
+/**
+ * @file
+ * Dump data in human/machine readable format.
+ * 
+ * @author Jose Fonseca <jfonseca@vmware.com>
+ */
+
+#ifndef U_DEBUG_DUMP_H_
+#define U_DEBUG_DUMP_H_
+
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_state.h"
+
+#include <stdio.h>
+
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+
+#define UTIL_DUMP_INVALID_NAME "<invalid>"
+
+
+/*
+ * p_defines.h
+ *
+ * XXX: These functions don't really dump anything -- just translate into
+ * strings so a verb better than "dump" should be used instead, in order to
+ * free up the namespace to the true dumper functions.
+ */
+
+const char *
+util_dump_blend_factor(unsigned value, boolean shortened);
+
+const char *
+util_dump_blend_func(unsigned value, boolean shortened);
+
+const char *
+util_dump_logicop(unsigned value, boolean shortened);
+
+const char *
+util_dump_func(unsigned value, boolean shortened);
+
+const char *
+util_dump_stencil_op(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_target(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_wrap(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_mipfilter(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_filter(unsigned value, boolean shortened);
+
+
+/*
+ * p_state.h, through a FILE
+ */
+
+void
+util_dump_template(FILE *stream,
+                   const struct pipe_resource *templat);
+
+void
+util_dump_rasterizer_state(FILE *stream,
+                           const struct pipe_rasterizer_state *state);
+
+void
+util_dump_poly_stipple(FILE *stream,
+                       const struct pipe_poly_stipple *state);
+
+void
+util_dump_viewport_state(FILE *stream,
+                         const struct pipe_viewport_state *state);
+
+void
+util_dump_scissor_state(FILE *stream,
+                        const struct pipe_scissor_state *state);
+
+void
+util_dump_clip_state(FILE *stream,
+                     const struct pipe_clip_state *state);
+
+void
+util_dump_shader_state(FILE *stream,
+                       const struct pipe_shader_state *state);
+
+void
+util_dump_depth_stencil_alpha_state(FILE *stream,
+                                    const struct pipe_depth_stencil_alpha_state *state);
+
+void
+util_dump_rt_blend_state(FILE *stream,
+                         const struct pipe_rt_blend_state *state);
+
+void
+util_dump_blend_state(FILE *stream,
+                      const struct pipe_blend_state *state);
+
+void
+util_dump_blend_color(FILE *stream,
+                      const struct pipe_blend_color *state);
+
+void
+util_dump_stencil_ref(FILE *stream,
+                      const struct pipe_stencil_ref *state);
+
+void
+util_dump_framebuffer_state(FILE *stream,
+                            const struct pipe_framebuffer_state *state);
+
+void
+util_dump_sampler_state(FILE *stream,
+                        const struct pipe_sampler_state *state);
+
+void
+util_dump_surface(FILE *stream,
+                  const struct pipe_surface *state);
+
+void
+util_dump_transfer(FILE *stream,
+                   const struct pipe_transfer *state);
+
+void
+util_dump_vertex_buffer(FILE *stream,
+                        const struct pipe_vertex_buffer *state);
+
+void
+util_dump_vertex_element(FILE *stream,
+                         const struct pipe_vertex_element *state);
+
+
+/* FIXME: Move the other debug_dump_xxx functions out of u_debug.h into here. */
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* U_DEBUG_H_ */
diff --git a/mesalib/src/gallium/auxiliary/util/u_dump_state.c b/mesalib/src/gallium/auxiliary/util/u_dump_state.c
index 8a7ec5848..917d7cd35 100644
--- a/mesalib/src/gallium/auxiliary/util/u_dump_state.c
+++ b/mesalib/src/gallium/auxiliary/util/u_dump_state.c
@@ -27,7 +27,6 @@
 
 
 #include "pipe/p_compiler.h"
-#include "os/os_stream.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/u_format.h"
@@ -41,7 +40,7 @@
  */
 
 static INLINE void
-util_stream_writef(struct os_stream *stream, const char *format, ...)
+util_stream_writef(FILE *stream, const char *format, ...)
 {
    static char buf[1024];
    unsigned len;
@@ -49,102 +48,102 @@ util_stream_writef(struct os_stream *stream, const char *format, ...)
    va_start(ap, format);
    len = util_vsnprintf(buf, sizeof(buf), format, ap);
    va_end(ap);
-   os_stream_write(stream, buf, len);
+   fwrite(buf, len, 1, stream);
 }
 
 static void
-util_dump_bool(struct os_stream *stream, int value)
+util_dump_bool(FILE *stream, int value)
 {
    util_stream_writef(stream, "%c", value ? '1' : '0');
 }
 
 static void
-util_dump_int(struct os_stream *stream, long long int value)
+util_dump_int(FILE *stream, long long int value)
 {
    util_stream_writef(stream, "%lli", value);
 }
 
 static void
-util_dump_uint(struct os_stream *stream, long long unsigned value)
+util_dump_uint(FILE *stream, long long unsigned value)
 {
    util_stream_writef(stream, "%llu", value);
 }
 
 static void
-util_dump_float(struct os_stream *stream, double value)
+util_dump_float(FILE *stream, double value)
 {
    util_stream_writef(stream, "%g", value);
 }
 
 static void
-util_dump_string(struct os_stream *stream, const char *str)
+util_dump_string(FILE *stream, const char *str)
 {
-   os_stream_write_str(stream, "\"");
-   os_stream_write_str(stream, str);
-   os_stream_write_str(stream, "\"");
+   fputs("\"", stream);
+   fputs(str, stream);
+   fputs("\"", stream);
 }
 
 static void
-util_dump_enum(struct os_stream *stream, const char *value)
+util_dump_enum(FILE *stream, const char *value)
 {
-   os_stream_write_str(stream, value);
+   fputs(value, stream);
 }
 
 static void
-util_dump_array_begin(struct os_stream *stream)
+util_dump_array_begin(FILE *stream)
 {
-   os_stream_write_str(stream, "{");
+   fputs("{", stream);
 }
 
 static void
-util_dump_array_end(struct os_stream *stream)
+util_dump_array_end(FILE *stream)
 {
-   os_stream_write_str(stream, "}");
+   fputs("}", stream);
 }
 
 static void
-util_dump_elem_begin(struct os_stream *stream)
+util_dump_elem_begin(FILE *stream)
 {
 }
 
 static void
-util_dump_elem_end(struct os_stream *stream)
+util_dump_elem_end(FILE *stream)
 {
-   os_stream_write_str(stream, ", ");
+   fputs(", ", stream);
 }
 
 static void
-util_dump_struct_begin(struct os_stream *stream, const char *name)
+util_dump_struct_begin(FILE *stream, const char *name)
 {
-   os_stream_write_str(stream, "{");
+   fputs("{", stream);
 }
 
 static void
-util_dump_struct_end(struct os_stream *stream)
+util_dump_struct_end(FILE *stream)
 {
-   os_stream_write_str(stream, "}");
+   fputs("}", stream);
 }
 
 static void
-util_dump_member_begin(struct os_stream *stream, const char *name)
+util_dump_member_begin(FILE *stream, const char *name)
 {
    util_stream_writef(stream, "%s = ", name);
 }
 
 static void
-util_dump_member_end(struct os_stream *stream)
+util_dump_member_end(FILE *stream)
 {
-   os_stream_write_str(stream, ", ");
+   fputs(", ", stream);
 }
 
 static void
-util_dump_null(struct os_stream *stream)
+util_dump_null(FILE *stream)
 {
-   os_stream_write_str(stream, "NULL");
+   fputs("NULL", stream);
 }
 
 static void
-util_dump_ptr(struct os_stream *stream, const void *value)
+util_dump_ptr(FILE *stream, const void *value)
 {
    if(value)
       util_stream_writef(stream, "0x%08lx", (unsigned long)(uintptr_t)value);
@@ -224,26 +223,26 @@ util_dump_ptr(struct os_stream *stream, const void *value)
 
 
 static void
-util_dump_format(struct os_stream *stream, enum pipe_format format)
+util_dump_format(FILE *stream, enum pipe_format format)
 {
    util_dump_enum(stream, util_format_name(format));
 }
 
 
 static void
-util_dump_enum_blend_factor(struct os_stream *stream, unsigned value)
+util_dump_enum_blend_factor(FILE *stream, unsigned value)
 {
    util_dump_enum(stream, util_dump_blend_factor(value, TRUE));
 }
 
 static void
-util_dump_enum_blend_func(struct os_stream *stream, unsigned value)
+util_dump_enum_blend_func(FILE *stream, unsigned value)
 {
    util_dump_enum(stream, util_dump_blend_func(value, TRUE));
 }
 
 static void
-util_dump_enum_func(struct os_stream *stream, unsigned value)
+util_dump_enum_func(FILE *stream, unsigned value)
 {
    util_dump_enum(stream, util_dump_func(value, TRUE));
 }
@@ -255,7 +254,7 @@ util_dump_enum_func(struct os_stream *stream, unsigned value)
 
 
 void
-util_dump_template(struct os_stream *stream, const struct pipe_resource *templat)
+util_dump_template(FILE *stream, const struct pipe_resource *templat)
 {
    if(!templat) {
       util_dump_null(stream);
@@ -293,7 +292,7 @@ util_dump_template(struct os_stream *stream, const struct pipe_resource *templat
 
 
 void
-util_dump_rasterizer_state(struct os_stream *stream, const struct pipe_rasterizer_state *state)
+util_dump_rasterizer_state(FILE *stream, const struct pipe_rasterizer_state *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -339,7 +338,7 @@ util_dump_rasterizer_state(struct os_stream *stream, const struct pipe_rasterize
 
 
 void
-util_dump_poly_stipple(struct os_stream *stream, const struct pipe_poly_stipple *state)
+util_dump_poly_stipple(FILE *stream, const struct pipe_poly_stipple *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -357,7 +356,7 @@ util_dump_poly_stipple(struct os_stream *stream, const struct pipe_poly_stipple
 
 
 void
-util_dump_viewport_state(struct os_stream *stream, const struct pipe_viewport_state *state)
+util_dump_viewport_state(FILE *stream, const struct pipe_viewport_state *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -374,7 +373,7 @@ util_dump_viewport_state(struct os_stream *stream, const struct pipe_viewport_st
 
 
 void
-util_dump_scissor_state(struct os_stream *stream, const struct pipe_scissor_state *state)
+util_dump_scissor_state(FILE *stream, const struct pipe_scissor_state *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -393,7 +392,7 @@ util_dump_scissor_state(struct os_stream *stream, const struct pipe_scissor_stat
 
 
 void
-util_dump_clip_state(struct os_stream *stream, const struct pipe_clip_state *state)
+util_dump_clip_state(FILE *stream, const struct pipe_clip_state *state)
 {
    unsigned i;
 
@@ -421,7 +420,7 @@ util_dump_clip_state(struct os_stream *stream, const struct pipe_clip_state *sta
 
 
 void
-util_dump_shader_state(struct os_stream *stream, const struct pipe_shader_state *state)
+util_dump_shader_state(FILE *stream, const struct pipe_shader_state *state)
 {
    char str[8192];
 
@@ -443,7 +442,7 @@ util_dump_shader_state(struct os_stream *stream, const struct pipe_shader_state
 
 
 void
-util_dump_depth_stencil_alpha_state(struct os_stream *stream, const struct pipe_depth_stencil_alpha_state *state)
+util_dump_depth_stencil_alpha_state(FILE *stream, const struct pipe_depth_stencil_alpha_state *state)
 {
    unsigned i;
 
@@ -498,7 +497,7 @@ util_dump_depth_stencil_alpha_state(struct os_stream *stream, const struct pipe_
 }
 
 void
-util_dump_rt_blend_state(struct os_stream *stream, const struct pipe_rt_blend_state *state)
+util_dump_rt_blend_state(FILE *stream, const struct pipe_rt_blend_state *state)
 {
    util_dump_struct_begin(stream, "pipe_rt_blend_state");
 
@@ -519,7 +518,7 @@ util_dump_rt_blend_state(struct os_stream *stream, const struct pipe_rt_blend_st
 }
 
 void
-util_dump_blend_state(struct os_stream *stream, const struct pipe_blend_state *state)
+util_dump_blend_state(FILE *stream, const struct pipe_blend_state *state)
 {
    unsigned valid_entries = 1;
 
@@ -551,7 +550,7 @@ util_dump_blend_state(struct os_stream *stream, const struct pipe_blend_state *s
 
 
 void
-util_dump_blend_color(struct os_stream *stream, const struct pipe_blend_color *state)
+util_dump_blend_color(FILE *stream, const struct pipe_blend_color *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -566,7 +565,7 @@ util_dump_blend_color(struct os_stream *stream, const struct pipe_blend_color *s
 }
 
 void
-util_dump_stencil_ref(struct os_stream *stream, const struct pipe_stencil_ref *state)
+util_dump_stencil_ref(FILE *stream, const struct pipe_stencil_ref *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -581,7 +580,7 @@ util_dump_stencil_ref(struct os_stream *stream, const struct pipe_stencil_ref *s
 }
 
 void
-util_dump_framebuffer_state(struct os_stream *stream, const struct pipe_framebuffer_state *state)
+util_dump_framebuffer_state(FILE *stream, const struct pipe_framebuffer_state *state)
 {
    util_dump_struct_begin(stream, "pipe_framebuffer_state");
 
@@ -596,7 +595,7 @@ util_dump_framebuffer_state(struct os_stream *stream, const struct pipe_framebuf
 
 
 void
-util_dump_sampler_state(struct os_stream *stream, const struct pipe_sampler_state *state)
+util_dump_sampler_state(FILE *stream, const struct pipe_sampler_state *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -625,7 +624,7 @@ util_dump_sampler_state(struct os_stream *stream, const struct pipe_sampler_stat
 
 
 void
-util_dump_surface(struct os_stream *stream, const struct pipe_surface *state)
+util_dump_surface(FILE *stream, const struct pipe_surface *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -650,7 +649,7 @@ util_dump_surface(struct os_stream *stream, const struct pipe_surface *state)
 
 
 void
-util_dump_transfer(struct os_stream *stream, const struct pipe_transfer *state)
+util_dump_transfer(FILE *stream, const struct pipe_transfer *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -672,7 +671,7 @@ util_dump_transfer(struct os_stream *stream, const struct pipe_transfer *state)
 
 
 void
-util_dump_vertex_buffer(struct os_stream *stream, const struct pipe_vertex_buffer *state)
+util_dump_vertex_buffer(FILE *stream, const struct pipe_vertex_buffer *state)
 {
    if(!state) {
       util_dump_null(stream);
@@ -690,7 +689,7 @@ util_dump_vertex_buffer(struct os_stream *stream, const struct pipe_vertex_buffe
 
 
 void
-util_dump_vertex_element(struct os_stream *stream, const struct pipe_vertex_element *state)
+util_dump_vertex_element(FILE *stream, const struct pipe_vertex_element *state)
 {
    if(!state) {
       util_dump_null(stream);
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.csv b/mesalib/src/gallium/auxiliary/util/u_format.csv
index 4b6fc7536..345cc9d47 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.csv
+++ b/mesalib/src/gallium/auxiliary/util/u_format.csv
@@ -158,6 +158,7 @@ PIPE_FORMAT_R8G8Bx_SNORM          , other,      1,  1, sn8 , sn8 ,     ,     , x
 # - http://www.opengl.org/registry/specs/EXT/texture_compression_s3tc.txt
 # - http://www.opengl.org/registry/specs/ARB/texture_compression_rgtc.txt
 # - http://www.opengl.org/registry/specs/EXT/texture_compression_latc.txt
+# - http://www.khronos.org/registry/gles/extensions/OES/OES_compressed_ETC1_RGB8_texture.txt
 # - http://msdn.microsoft.com/en-us/library/bb694531.aspx
 PIPE_FORMAT_DXT1_RGB              , s3tc, 4, 4, x64 ,     ,     ,     , xyz1, rgb
 PIPE_FORMAT_DXT1_RGBA             , s3tc, 4, 4, x64 ,     ,     ,     , xyzw, rgb
@@ -178,6 +179,8 @@ PIPE_FORMAT_LATC1_SNORM           , rgtc, 4, 4, x64,      ,     ,     , xxx1, rg
 PIPE_FORMAT_LATC2_UNORM           , rgtc, 4, 4, x128,     ,     ,     , xxxy, rgb
 PIPE_FORMAT_LATC2_SNORM           , rgtc, 4, 4, x128,     ,     ,     , xxxy, rgb
 
+PIPE_FORMAT_ETC1_RGB8             ,  etc, 4, 4, x64,      ,     ,     , xyz1, rgb
+
 # Straightforward D3D10-like formats (also used for 
 # vertex buffer element description)
 # 
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index 99ee6767e..9694c9034 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -70,9 +70,14 @@ enum util_format_layout {
    UTIL_FORMAT_LAYOUT_RGTC = 5,
 
    /**
+    * Ericsson Texture Compression
+    */
+   UTIL_FORMAT_LAYOUT_ETC = 6,
+
+   /**
     * Everything else that doesn't fit in any of the above layouts.
     */
-   UTIL_FORMAT_LAYOUT_OTHER = 6
+   UTIL_FORMAT_LAYOUT_OTHER = 7
 };
 
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_etc.c b/mesalib/src/gallium/auxiliary/util/u_format_etc.c
new file mode 100644
index 000000000..7500e1ed6
--- /dev/null
+++ b/mesalib/src/gallium/auxiliary/util/u_format_etc.c
@@ -0,0 +1,104 @@
+#include "pipe/p_compiler.h"
+#include "util/u_debug.h"
+#include "util/u_math.h"
+#include "u_format_etc.h"
+
+/* define etc1_parse_block and etc. */
+#define UINT8_TYPE uint8_t
+#define TAG(x) x
+#include "../../../mesa/main/texcompress_etc_tmp.h"
+#undef TAG
+#undef UINT8_TYPE
+
+void
+util_format_etc1_rgb8_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
+   const unsigned bw = 4, bh = 4, bs = 8, comps = 4;
+   struct etc1_block block;
+   unsigned x, y, i, j;
+
+   for (y = 0; y < height; y += bh) {
+      const uint8_t *src = src_row;
+
+      for (x = 0; x < width; x+= bw) {
+         etc1_parse_block(&block, src);
+
+         for (j = 0; j < bh; j++) {
+            uint8_t *dst = dst_row + (y + j) * dst_stride + x * comps;
+            for (i = 0; i < bw; i++) {
+               etc1_fetch_texel(&block, i, j, dst);
+               dst[3] = 255;
+               dst += comps;
+            }
+         }
+
+         src += bs;
+      }
+
+      src_row += src_stride;
+   }
+}
+
+void
+util_format_etc1_rgb8_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
+   assert(0);
+}
+
+void
+util_format_etc1_rgb8_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
+   const unsigned bw = 4, bh = 4, bs = 8, comps = 4;
+   struct etc1_block block;
+   unsigned x, y, i, j;
+
+   for (y = 0; y < height; y += bh) {
+      const uint8_t *src = src_row;
+
+      for (x = 0; x < width; x+= bw) {
+         etc1_parse_block(&block, src);
+
+         for (j = 0; j < bh; j++) {
+            float *dst = dst_row + (y + j) * dst_stride / sizeof(*dst_row) + x * comps;
+            uint8_t tmp[3];
+
+            for (i = 0; i < bw; i++) {
+               etc1_fetch_texel(&block, i, j, tmp);
+               dst[0] = ubyte_to_float(tmp[0]);
+               dst[1] = ubyte_to_float(tmp[1]);
+               dst[2] = ubyte_to_float(tmp[2]);
+               dst[3] = 1.0f;
+               dst += comps;
+            }
+         }
+
+         src += bs;
+      }
+
+      src_row += src_stride;
+   }
+}
+
+void
+util_format_etc1_rgb8_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height)
+{
+   assert(0);
+}
+
+void
+util_format_etc1_rgb8_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j)
+{
+   const unsigned bw = 4, bh = 4;
+   struct etc1_block block;
+   uint8_t tmp[3];
+
+   assert(i < bw && j < bh);
+
+   etc1_parse_block(&block, src);
+   etc1_fetch_texel(&block, i, j, tmp);
+
+   dst[0] = ubyte_to_float(tmp[0]);
+   dst[1] = ubyte_to_float(tmp[1]);
+   dst[2] = ubyte_to_float(tmp[2]);
+   dst[3] = 1.0f;
+}
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_etc.h b/mesalib/src/gallium/auxiliary/util/u_format_etc.h
new file mode 100644
index 000000000..30c3dcb92
--- /dev/null
+++ b/mesalib/src/gallium/auxiliary/util/u_format_etc.h
@@ -0,0 +1,46 @@
+/**************************************************************************
+ *
+ * Copyright 2011 LunarG, 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS 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.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ **************************************************************************/
+
+#ifndef U_FORMAT_ETC1_H_
+#define U_FORMAT_ETC1_H_
+
+void
+util_format_etc1_rgb8_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height);
+
+void
+util_format_etc1_rgb8_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height);
+
+void
+util_format_etc1_rgb8_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height);
+
+void
+util_format_etc1_rgb8_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height);
+
+void
+util_format_etc1_rgb8_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j);
+
+#endif /* U_FORMAT_ETC1_H_ */
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_pack.py b/mesalib/src/gallium/auxiliary/util/u_format_pack.py
index 14a504944..fff409fb7 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format_pack.py
+++ b/mesalib/src/gallium/auxiliary/util/u_format_pack.py
@@ -658,7 +658,7 @@ def generate_format_fetch(format, dst_channel, dst_native_type, dst_suffix):
 
 
 def is_format_hand_written(format):
-    return format.layout in ('s3tc', 'rgtc', 'subsampled', 'other') or format.colorspace == ZS
+    return format.layout in ('s3tc', 'rgtc', 'etc', 'subsampled', 'other') or format.colorspace == ZS
 
 
 def generate(formats):
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_table.py b/mesalib/src/gallium/auxiliary/util/u_format_table.py
index 703d99959..07beb3872 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format_table.py
+++ b/mesalib/src/gallium/auxiliary/util/u_format_table.py
@@ -89,6 +89,7 @@ def write_format_table(formats):
     print '#include "u_format_s3tc.h"'
     print '#include "u_format_rgtc.h"'
     print '#include "u_format_latc.h"'
+    print '#include "u_format_etc.h"'
     print
     
     u_format_pack.generate(formats)
diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h
index 551463f75..f908341f6 100644
--- a/mesalib/src/gallium/auxiliary/util/u_math.h
+++ b/mesalib/src/gallium/auxiliary/util/u_math.h
@@ -48,74 +48,8 @@ extern "C" {
 #endif
 
 
-#if defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)
-__inline double ceil(double val)
-{
-   double ceil_val;
-
-   if ((val - (long) val) == 0) {
-      ceil_val = val;
-   }
-   else {
-      if (val > 0) {
-         ceil_val = (long) val + 1;
-      }
-      else {
-         ceil_val = (long) val;
-      }
-   }
-
-   return ceil_val;
-}
-
-#ifndef PIPE_SUBSYSTEM_WINDOWS_CE_OGL
-__inline double floor(double val)
-{
-   double floor_val;
-
-   if ((val - (long) val) == 0) {
-      floor_val = val;
-   }
-   else {
-      if (val > 0) {
-         floor_val = (long) val;
-      }
-      else {
-         floor_val = (long) val - 1;
-      }
-   }
-
-   return floor_val;
-}
-#endif
-
-#pragma function(pow)
-__inline double __cdecl pow(double val, double exponent)
-{
-   /* XXX */
-   assert(0);
-   return 0;
-}
-
-#pragma function(log)
-__inline double __cdecl log(double val)
-{
-   /* XXX */
-   assert(0);
-   return 0;
-}
-
-#pragma function(atan2)
-__inline double __cdecl atan2(double val)
-{
-   /* XXX */
-   assert(0);
-   return 0;
-}
-#else
 #include <math.h>
 #include <stdarg.h>
-#endif
 
 
 #ifndef M_SQRT2
@@ -125,7 +59,7 @@ __inline double __cdecl atan2(double val)
 
 #if defined(_MSC_VER) 
 
-#if _MSC_VER < 1400 && !defined(__cplusplus) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)
+#if _MSC_VER < 1400 && !defined(__cplusplus)
  
 static INLINE float cosf( float f ) 
 {
diff --git a/mesalib/src/gallium/auxiliary/util/u_snprintf.c b/mesalib/src/gallium/auxiliary/util/u_snprintf.c
index a601df4e5..f0d53b3ce 100644
--- a/mesalib/src/gallium/auxiliary/util/u_snprintf.c
+++ b/mesalib/src/gallium/auxiliary/util/u_snprintf.c
@@ -1,1497 +1,1489 @@
-/*

- * Copyright (c) 1995 Patrick Powell.

- *

- * This code is based on code written by Patrick Powell <papowell@astart.com>.

- * It may be used for any purpose as long as this notice remains intact on all

- * source code distributions.

- */

-

-/*

- * Copyright (c) 2008 Holger Weiss.

- *

- * This version of the code is maintained by Holger Weiss <holger@jhweiss.de>.

- * My changes to the code may freely be used, modified and/or redistributed for

- * any purpose.  It would be nice if additions and fixes to this file (including

- * trivial code cleanups) would be sent back in order to let me include them in

- * the version available at <http://www.jhweiss.de/software/snprintf.html>.

- * However, this is not a requirement for using or redistributing (possibly

- * modified) versions of this file, nor is leaving this notice intact mandatory.

- */

-

-/*

- * History

- *

- * 2008-01-20 Holger Weiss <holger@jhweiss.de> for C99-snprintf 1.1:

- *

- * 	Fixed the detection of infinite floating point values on IRIX (and

- * 	possibly other systems) and applied another few minor cleanups.

- *

- * 2008-01-06 Holger Weiss <holger@jhweiss.de> for C99-snprintf 1.0:

- *

- * 	Added a lot of new features, fixed many bugs, and incorporated various

- * 	improvements done by Andrew Tridgell <tridge@samba.org>, Russ Allbery

- * 	<rra@stanford.edu>, Hrvoje Niksic <hniksic@xemacs.org>, Damien Miller

- * 	<djm@mindrot.org>, and others for the Samba, INN, Wget, and OpenSSH

- * 	projects.  The additions include: support the "e", "E", "g", "G", and

- * 	"F" conversion specifiers (and use conversion style "f" or "F" for the

- * 	still unsupported "a" and "A" specifiers); support the "hh", "ll", "j",

- * 	"t", and "z" length modifiers; support the "#" flag and the (non-C99)

- * 	"'" flag; use localeconv(3) (if available) to get both the current

- * 	locale's decimal point character and the separator between groups of

- * 	digits; fix the handling of various corner cases of field width and

- * 	precision specifications; fix various floating point conversion bugs;

- * 	handle infinite and NaN floating point values; don't attempt to write to

- * 	the output buffer (which may be NULL) if a size of zero was specified;

- * 	check for integer overflow of the field width, precision, and return

- * 	values and during the floating point conversion; use the OUTCHAR() macro

- * 	instead of a function for better performance; provide asprintf(3) and

- * 	vasprintf(3) functions; add new test cases.  The replacement functions

- * 	have been renamed to use an "rpl_" prefix, the function calls in the

- * 	main project (and in this file) must be redefined accordingly for each

- * 	replacement function which is needed (by using Autoconf or other means).

- * 	Various other minor improvements have been applied and the coding style

- * 	was cleaned up for consistency.

- *

- * 2007-07-23 Holger Weiss <holger@jhweiss.de> for Mutt 1.5.13:

- *

- * 	C99 compliant snprintf(3) and vsnprintf(3) functions return the number

- * 	of characters that would have been written to a sufficiently sized

- * 	buffer (excluding the '\0').  The original code simply returned the

- * 	length of the resulting output string, so that's been fixed.

- *

- * 1998-03-05 Michael Elkins <me@mutt.org> for Mutt 0.90.8:

- *

- * 	The original code assumed that both snprintf(3) and vsnprintf(3) were

- * 	missing.  Some systems only have snprintf(3) but not vsnprintf(3), so

- * 	the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.

- *

- * 1998-01-27 Thomas Roessler <roessler@does-not-exist.org> for Mutt 0.89i:

- *

- * 	The PGP code was using unsigned hexadecimal formats.  Unfortunately,

- * 	unsigned formats simply didn't work.

- *

- * 1997-10-22 Brandon Long <blong@fiction.net> for Mutt 0.87.1:

- *

- * 	Ok, added some minimal floating point support, which means this probably

- * 	requires libm on most operating systems.  Don't yet support the exponent

- * 	(e,E) and sigfig (g,G).  Also, fmtint() was pretty badly broken, it just

- * 	wasn't being exercised in ways which showed it, so that's been fixed.

- * 	Also, formatted the code to Mutt conventions, and removed dead code left

- * 	over from the original.  Also, there is now a builtin-test, run with:

- * 	gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm && ./snprintf

- *

- * 2996-09-15 Brandon Long <blong@fiction.net> for Mutt 0.43:

- *

- * 	This was ugly.  It is still ugly.  I opted out of floating point

- * 	numbers, but the formatter understands just about everything from the

- * 	normal C string format, at least as far as I can tell from the Solaris

- * 	2.5 printf(3S) man page.

- */

-

-/*

- * ToDo

- *

- * - Add wide character support.

- * - Add support for "%a" and "%A" conversions.

- * - Create test routines which predefine the expected results.  Our test cases

- *   usually expose bugs in system implementations rather than in ours :-)

- */

-

-/*

- * Usage

- *

- * 1) The following preprocessor macros should be defined to 1 if the feature or

- *    file in question is available on the target system (by using Autoconf or

- *    other means), though basic functionality should be available as long as

- *    HAVE_STDARG_H and HAVE_STDLIB_H are defined correctly:

- *

- *    	HAVE_VSNPRINTF

- *    	HAVE_SNPRINTF

- *    	HAVE_VASPRINTF

- *    	HAVE_ASPRINTF

- *    	HAVE_STDARG_H

- *    	HAVE_STDDEF_H

- *    	HAVE_STDINT_H

- *    	HAVE_STDLIB_H

- *    	HAVE_INTTYPES_H

- *    	HAVE_LOCALE_H

- *    	HAVE_LOCALECONV

- *    	HAVE_LCONV_DECIMAL_POINT

- *    	HAVE_LCONV_THOUSANDS_SEP

- *    	HAVE_LONG_DOUBLE

- *    	HAVE_LONG_LONG_INT

- *    	HAVE_UNSIGNED_LONG_LONG_INT

- *    	HAVE_INTMAX_T

- *    	HAVE_UINTMAX_T

- *    	HAVE_UINTPTR_T

- *    	HAVE_PTRDIFF_T

- *    	HAVE_VA_COPY

- *    	HAVE___VA_COPY

- *

- * 2) The calls to the functions which should be replaced must be redefined

- *    throughout the project files (by using Autoconf or other means):

- *

- *    	#define vsnprintf rpl_vsnprintf

- *    	#define snprintf rpl_snprintf

- *    	#define vasprintf rpl_vasprintf

- *    	#define asprintf rpl_asprintf

- *

- * 3) The required replacement functions should be declared in some header file

- *    included throughout the project files:

- *

- *    	#if HAVE_CONFIG_H

- *    	#include <config.h>

- *    	#endif

- *    	#if HAVE_STDARG_H

- *    	#include <stdarg.h>

- *    	#if !HAVE_VSNPRINTF

- *    	int rpl_vsnprintf(char *, size_t, const char *, va_list);

- *    	#endif

- *    	#if !HAVE_SNPRINTF

- *    	int rpl_snprintf(char *, size_t, const char *, ...);

- *    	#endif

- *    	#if !HAVE_VASPRINTF

- *    	int rpl_vasprintf(char **, const char *, va_list);

- *    	#endif

- *    	#if !HAVE_ASPRINTF

- *    	int rpl_asprintf(char **, const char *, ...);

- *    	#endif

- *    	#endif

- *

- * Autoconf macros for handling step 1 and step 2 are available at

- * <http://www.jhweiss.de/software/snprintf.html>.

- */

-

-#include "pipe/p_config.h"

-

-#if HAVE_CONFIG_H

-#include <config.h>

-#else

-#ifdef WIN32

-#define vsnprintf util_vsnprintf

-#define snprintf util_snprintf

-#define HAVE_VSNPRINTF 0

-#define HAVE_SNPRINTF 0

-#define HAVE_VASPRINTF 1 /* not needed */

-#define HAVE_ASPRINTF 1 /* not needed */

-#define HAVE_STDARG_H 1

-#define HAVE_STDDEF_H 1

-#define HAVE_STDINT_H 0

-#define HAVE_STDLIB_H 1

-#define HAVE_INTTYPES_H 0

-#define HAVE_LOCALE_H 0

-#define HAVE_LOCALECONV 0

-#define HAVE_LCONV_DECIMAL_POINT 0

-#define HAVE_LCONV_THOUSANDS_SEP 0

-#define HAVE_LONG_DOUBLE 0

-#define HAVE_LONG_LONG_INT 1

-#define HAVE_UNSIGNED_LONG_LONG_INT 1

-#define HAVE_INTMAX_T 0

-#define HAVE_UINTMAX_T 0

-#define HAVE_UINTPTR_T 1

-#define HAVE_PTRDIFF_T 1

-#define HAVE_VA_COPY 0

-#define HAVE___VA_COPY 0

-#else

-#define HAVE_VSNPRINTF 1

-#define HAVE_SNPRINTF 1

-#define HAVE_VASPRINTF 1

-#define HAVE_ASPRINTF 1

-#endif

-#endif	/* HAVE_CONFIG_H */

-

-#if !HAVE_SNPRINTF || !HAVE_VSNPRINTF || !HAVE_ASPRINTF || !HAVE_VASPRINTF

-#include <stdio.h>	/* For NULL, size_t, vsnprintf(3), and vasprintf(3). */

-#ifdef VA_START

-#undef VA_START

-#endif	/* defined(VA_START) */

-#ifdef VA_SHIFT

-#undef VA_SHIFT

-#endif	/* defined(VA_SHIFT) */

-#if HAVE_STDARG_H

-#include <stdarg.h>

-#define VA_START(ap, last) va_start(ap, last)

-#define VA_SHIFT(ap, value, type) /* No-op for ANSI C. */

-#else	/* Assume <varargs.h> is available. */

-#include <varargs.h>

-#define VA_START(ap, last) va_start(ap)	/* "last" is ignored. */

-#define VA_SHIFT(ap, value, type) value = va_arg(ap, type)

-#endif	/* HAVE_STDARG_H */

-

-#if !HAVE_VASPRINTF

-#if HAVE_STDLIB_H

-#include <stdlib.h>	/* For malloc(3). */

-#endif	/* HAVE_STDLIB_H */

-#ifdef VA_COPY

-#undef VA_COPY

-#endif	/* defined(VA_COPY) */

-#ifdef VA_END_COPY

-#undef VA_END_COPY

-#endif	/* defined(VA_END_COPY) */

-#if HAVE_VA_COPY

-#define VA_COPY(dest, src) va_copy(dest, src)

-#define VA_END_COPY(ap) va_end(ap)

-#elif HAVE___VA_COPY

-#define VA_COPY(dest, src) __va_copy(dest, src)

-#define VA_END_COPY(ap) va_end(ap)

-#else

-#define VA_COPY(dest, src) (void)mymemcpy(&dest, &src, sizeof(va_list))

-#define VA_END_COPY(ap) /* No-op. */

-#define NEED_MYMEMCPY 1

-static void *mymemcpy(void *, void *, size_t);

-#endif	/* HAVE_VA_COPY */

-#endif	/* !HAVE_VASPRINTF */

-

-#if !HAVE_VSNPRINTF

-#include <limits.h>	/* For *_MAX. */

-#if HAVE_INTTYPES_H

-#include <inttypes.h>	/* For intmax_t (if not defined in <stdint.h>). */

-#endif	/* HAVE_INTTYPES_H */

-#if HAVE_LOCALE_H

-#include <locale.h>	/* For localeconv(3). */

-#endif	/* HAVE_LOCALE_H */

-#if HAVE_STDDEF_H

-#include <stddef.h>	/* For ptrdiff_t. */

-#endif	/* HAVE_STDDEF_H */

-#if HAVE_STDINT_H

-#include <stdint.h>	/* For intmax_t. */

-#endif	/* HAVE_STDINT_H */

-

-/* Support for unsigned long long int.  We may also need ULLONG_MAX. */

-#ifndef ULONG_MAX	/* We may need ULONG_MAX as a fallback. */

-#ifdef UINT_MAX

-#define ULONG_MAX UINT_MAX

-#else

-#define ULONG_MAX INT_MAX

-#endif	/* defined(UINT_MAX) */

-#endif	/* !defined(ULONG_MAX) */

-#ifdef ULLONG

-#undef ULLONG

-#endif	/* defined(ULLONG) */

-#if HAVE_UNSIGNED_LONG_LONG_INT

-#define ULLONG unsigned long long int

-#ifndef ULLONG_MAX

-#define ULLONG_MAX ULONG_MAX

-#endif	/* !defined(ULLONG_MAX) */

-#else

-#define ULLONG unsigned long int

-#ifdef ULLONG_MAX

-#undef ULLONG_MAX

-#endif	/* defined(ULLONG_MAX) */

-#define ULLONG_MAX ULONG_MAX

-#endif	/* HAVE_LONG_LONG_INT */

-

-/* Support for uintmax_t.  We also need UINTMAX_MAX. */

-#ifdef UINTMAX_T

-#undef UINTMAX_T

-#endif	/* defined(UINTMAX_T) */

-#if HAVE_UINTMAX_T || defined(uintmax_t)

-#define UINTMAX_T uintmax_t

-#ifndef UINTMAX_MAX

-#define UINTMAX_MAX ULLONG_MAX

-#endif	/* !defined(UINTMAX_MAX) */

-#else

-#define UINTMAX_T ULLONG

-#ifdef UINTMAX_MAX

-#undef UINTMAX_MAX

-#endif	/* defined(UINTMAX_MAX) */

-#define UINTMAX_MAX ULLONG_MAX

-#endif	/* HAVE_UINTMAX_T || defined(uintmax_t) */

-

-/* Support for long double. */

-#ifndef LDOUBLE

-#if HAVE_LONG_DOUBLE

-#define LDOUBLE long double

-#else

-#define LDOUBLE double

-#endif	/* HAVE_LONG_DOUBLE */

-#endif	/* !defined(LDOUBLE) */

-

-/* Support for long long int. */

-#ifndef LLONG

-#if HAVE_LONG_LONG_INT

-#define LLONG long long int

-#else

-#define LLONG long int

-#endif	/* HAVE_LONG_LONG_INT */

-#endif	/* !defined(LLONG) */

-

-/* Support for intmax_t. */

-#ifndef INTMAX_T

-#if HAVE_INTMAX_T || defined(intmax_t)

-#define INTMAX_T intmax_t

-#else

-#define INTMAX_T LLONG

-#endif	/* HAVE_INTMAX_T || defined(intmax_t) */

-#endif	/* !defined(INTMAX_T) */

-

-/* Support for uintptr_t. */

-#ifndef UINTPTR_T

-#if HAVE_UINTPTR_T || defined(uintptr_t)

-#define UINTPTR_T uintptr_t

-#else

-#define UINTPTR_T unsigned long int

-#endif	/* HAVE_UINTPTR_T || defined(uintptr_t) */

-#endif	/* !defined(UINTPTR_T) */

-

-/* WinCE5.0 does not have uintptr_t defined */ 

-#if (_WIN32_WCE < 600) 

-#ifdef UINTPTR_T 

-#undef UINTPTR_T 

-#endif 

-#define UINTPTR_T unsigned long int 

-#endif 

-

-

-/* Support for ptrdiff_t. */

-#ifndef PTRDIFF_T

-#if HAVE_PTRDIFF_T || defined(ptrdiff_t)

-#define PTRDIFF_T ptrdiff_t

-#else

-#define PTRDIFF_T long int

-#endif	/* HAVE_PTRDIFF_T || defined(ptrdiff_t) */

-#endif	/* !defined(PTRDIFF_T) */

-

-/*

- * We need an unsigned integer type corresponding to ptrdiff_t (cf. C99:

- * 7.19.6.1, 7).  However, we'll simply use PTRDIFF_T and convert it to an

- * unsigned type if necessary.  This should work just fine in practice.

- */

-#ifndef UPTRDIFF_T

-#define UPTRDIFF_T PTRDIFF_T

-#endif	/* !defined(UPTRDIFF_T) */

-

-/*

- * We need a signed integer type corresponding to size_t (cf. C99: 7.19.6.1, 7).

- * However, we'll simply use size_t and convert it to a signed type if

- * necessary.  This should work just fine in practice.

- */

-#ifndef SSIZE_T

-#define SSIZE_T size_t

-#endif	/* !defined(SSIZE_T) */

-

-/* Either ERANGE or E2BIG should be available everywhere. */

-#ifndef ERANGE

-#define ERANGE E2BIG

-#endif	/* !defined(ERANGE) */

-#ifndef EOVERFLOW

-#define EOVERFLOW ERANGE

-#endif	/* !defined(EOVERFLOW) */

-

-/*

- * Buffer size to hold the octal string representation of UINT128_MAX without

- * nul-termination ("3777777777777777777777777777777777777777777").

- */

-#ifdef MAX_CONVERT_LENGTH

-#undef MAX_CONVERT_LENGTH

-#endif	/* defined(MAX_CONVERT_LENGTH) */

-#define MAX_CONVERT_LENGTH      43

-

-/* Format read states. */

-#define PRINT_S_DEFAULT         0

-#define PRINT_S_FLAGS           1

-#define PRINT_S_WIDTH           2

-#define PRINT_S_DOT             3

-#define PRINT_S_PRECISION       4

-#define PRINT_S_MOD             5

-#define PRINT_S_CONV            6

-

-/* Format flags. */

-#define PRINT_F_MINUS           (1 << 0)

-#define PRINT_F_PLUS            (1 << 1)

-#define PRINT_F_SPACE           (1 << 2)

-#define PRINT_F_NUM             (1 << 3)

-#define PRINT_F_ZERO            (1 << 4)

-#define PRINT_F_QUOTE           (1 << 5)

-#define PRINT_F_UP              (1 << 6)

-#define PRINT_F_UNSIGNED        (1 << 7)

-#define PRINT_F_TYPE_G          (1 << 8)

-#define PRINT_F_TYPE_E          (1 << 9)

-

-/* Conversion flags. */

-#define PRINT_C_CHAR            1

-#define PRINT_C_SHORT           2

-#define PRINT_C_LONG            3

-#define PRINT_C_LLONG           4

-#define PRINT_C_LDOUBLE         5

-#define PRINT_C_SIZE            6

-#define PRINT_C_PTRDIFF         7

-#define PRINT_C_INTMAX          8

-

-#ifndef MAX

-#define MAX(x, y) ((x >= y) ? x : y)

-#endif	/* !defined(MAX) */

-#ifndef CHARTOINT

-#define CHARTOINT(ch) (ch - '0')

-#endif	/* !defined(CHARTOINT) */

-#ifndef ISDIGIT

-#define ISDIGIT(ch) ('0' <= (unsigned char)ch && (unsigned char)ch <= '9')

-#endif	/* !defined(ISDIGIT) */

-#ifndef ISNAN

-#define ISNAN(x) (x != x)

-#endif	/* !defined(ISNAN) */

-#ifndef ISINF

-#define ISINF(x) (x != 0.0 && x + x == x)

-#endif	/* !defined(ISINF) */

-

-#ifdef OUTCHAR

-#undef OUTCHAR

-#endif	/* defined(OUTCHAR) */

-#define OUTCHAR(str, len, size, ch)                                          \

-do {                                                                         \

-	if (len + 1 < size)                                                  \

-		str[len] = ch;                                               \

-	(len)++;                                                             \

-} while (/* CONSTCOND */ 0)

-

-static void fmtstr(char *, size_t *, size_t, const char *, int, int, int);

-static void fmtint(char *, size_t *, size_t, INTMAX_T, int, int, int, int);

-static void fmtflt(char *, size_t *, size_t, LDOUBLE, int, int, int, int *);

-static void printsep(char *, size_t *, size_t);

-static int getnumsep(int);

-static int getexponent(LDOUBLE);

-static int convert(UINTMAX_T, char *, size_t, int, int);

-static UINTMAX_T cast(LDOUBLE);

-static UINTMAX_T myround(LDOUBLE);

-static LDOUBLE mypow10(int);

-

-int

-util_vsnprintf(char *str, size_t size, const char *format, va_list args)

-{

-	LDOUBLE fvalue;

-	INTMAX_T value;

-	unsigned char cvalue;

-	const char *strvalue;

-	INTMAX_T *intmaxptr;

-	PTRDIFF_T *ptrdiffptr;

-	SSIZE_T *sizeptr;

-	LLONG *llongptr;

-	long int *longptr;

-	int *intptr;

-	short int *shortptr;

-	signed char *charptr;

-	size_t len = 0;

-	int overflow = 0;

-	int base = 0;

-	int cflags = 0;

-	int flags = 0;

-	int width = 0;

-	int precision = -1;

-	int state = PRINT_S_DEFAULT;

-	char ch = *format++;

-

-	/*

-	 * C99 says: "If `n' is zero, nothing is written, and `s' may be a null

-	 * pointer." (7.19.6.5, 2)  We're forgiving and allow a NULL pointer

-	 * even if a size larger than zero was specified.  At least NetBSD's

-	 * snprintf(3) does the same, as well as other versions of this file.

-	 * (Though some of these versions will write to a non-NULL buffer even

-	 * if a size of zero was specified, which violates the standard.)

-	 */

-	if (str == NULL && size != 0)

-		size = 0;

-

-	while (ch != '\0')

-		switch (state) {

-		case PRINT_S_DEFAULT:

-			if (ch == '%')

-				state = PRINT_S_FLAGS;

-			else

-				OUTCHAR(str, len, size, ch);

-			ch = *format++;

-			break;

-		case PRINT_S_FLAGS:

-			switch (ch) {

-			case '-':

-				flags |= PRINT_F_MINUS;

-				ch = *format++;

-				break;

-			case '+':

-				flags |= PRINT_F_PLUS;

-				ch = *format++;

-				break;

-			case ' ':

-				flags |= PRINT_F_SPACE;

-				ch = *format++;

-				break;

-			case '#':

-				flags |= PRINT_F_NUM;

-				ch = *format++;

-				break;

-			case '0':

-				flags |= PRINT_F_ZERO;

-				ch = *format++;

-				break;

-			case '\'':	/* SUSv2 flag (not in C99). */

-				flags |= PRINT_F_QUOTE;

-				ch = *format++;

-				break;

-			default:

-				state = PRINT_S_WIDTH;

-				break;

-			}

-			break;

-		case PRINT_S_WIDTH:

-			if (ISDIGIT(ch)) {

-				ch = CHARTOINT(ch);

-				if (width > (INT_MAX - ch) / 10) {

-					overflow = 1;

-					goto out;

-				}

-				width = 10 * width + ch;

-				ch = *format++;

-			} else if (ch == '*') {

-				/*

-				 * C99 says: "A negative field width argument is

-				 * taken as a `-' flag followed by a positive

-				 * field width." (7.19.6.1, 5)

-				 */

-				if ((width = va_arg(args, int)) < 0) {

-					flags |= PRINT_F_MINUS;

-					width = -width;

-				}

-				ch = *format++;

-				state = PRINT_S_DOT;

-			} else

-				state = PRINT_S_DOT;

-			break;

-		case PRINT_S_DOT:

-			if (ch == '.') {

-				state = PRINT_S_PRECISION;

-				ch = *format++;

-			} else

-				state = PRINT_S_MOD;

-			break;

-		case PRINT_S_PRECISION:

-			if (precision == -1)

-				precision = 0;

-			if (ISDIGIT(ch)) {

-				ch = CHARTOINT(ch);

-				if (precision > (INT_MAX - ch) / 10) {

-					overflow = 1;

-					goto out;

-				}

-				precision = 10 * precision + ch;

-				ch = *format++;

-			} else if (ch == '*') {

-				/*

-				 * C99 says: "A negative precision argument is

-				 * taken as if the precision were omitted."

-				 * (7.19.6.1, 5)

-				 */

-				if ((precision = va_arg(args, int)) < 0)

-					precision = -1;

-				ch = *format++;

-				state = PRINT_S_MOD;

-			} else

-				state = PRINT_S_MOD;

-			break;

-		case PRINT_S_MOD:

-			switch (ch) {

-			case 'h':

-				ch = *format++;

-				if (ch == 'h') {	/* It's a char. */

-					ch = *format++;

-					cflags = PRINT_C_CHAR;

-				} else

-					cflags = PRINT_C_SHORT;

-				break;

-			case 'l':

-				ch = *format++;

-				if (ch == 'l') {	/* It's a long long. */

-					ch = *format++;

-					cflags = PRINT_C_LLONG;

-				} else

-					cflags = PRINT_C_LONG;

-				break;

-			case 'L':

-				cflags = PRINT_C_LDOUBLE;

-				ch = *format++;

-				break;

-			case 'j':

-				cflags = PRINT_C_INTMAX;

-				ch = *format++;

-				break;

-			case 't':

-				cflags = PRINT_C_PTRDIFF;

-				ch = *format++;

-				break;

-			case 'z':

-				cflags = PRINT_C_SIZE;

-				ch = *format++;

-				break;

-			}

-			state = PRINT_S_CONV;

-			break;

-		case PRINT_S_CONV:

-			switch (ch) {

-			case 'd':

-				/* FALLTHROUGH */

-			case 'i':

-				switch (cflags) {

-				case PRINT_C_CHAR:

-					value = (signed char)va_arg(args, int);

-					break;

-				case PRINT_C_SHORT:

-					value = (short int)va_arg(args, int);

-					break;

-				case PRINT_C_LONG:

-					value = va_arg(args, long int);

-					break;

-				case PRINT_C_LLONG:

-					value = va_arg(args, LLONG);

-					break;

-				case PRINT_C_SIZE:

-					value = va_arg(args, SSIZE_T);

-					break;

-				case PRINT_C_INTMAX:

-					value = va_arg(args, INTMAX_T);

-					break;

-				case PRINT_C_PTRDIFF:

-					value = va_arg(args, PTRDIFF_T);

-					break;

-				default:

-					value = va_arg(args, int);

-					break;

-				}

-				fmtint(str, &len, size, value, 10, width,

-				    precision, flags);

-				break;

-			case 'X':

-				flags |= PRINT_F_UP;

-				/* FALLTHROUGH */

-			case 'x':

-				base = 16;

-				/* FALLTHROUGH */

-			case 'o':

-				if (base == 0)

-					base = 8;

-				/* FALLTHROUGH */

-			case 'u':

-				if (base == 0)

-					base = 10;

-				flags |= PRINT_F_UNSIGNED;

-				switch (cflags) {

-				case PRINT_C_CHAR:

-					value = (unsigned char)va_arg(args,

-					    unsigned int);

-					break;

-				case PRINT_C_SHORT:

-					value = (unsigned short int)va_arg(args,

-					    unsigned int);

-					break;

-				case PRINT_C_LONG:

-					value = va_arg(args, unsigned long int);

-					break;

-				case PRINT_C_LLONG:

-					value = va_arg(args, ULLONG);

-					break;

-				case PRINT_C_SIZE:

-					value = va_arg(args, size_t);

-					break;

-				case PRINT_C_INTMAX:

-					value = va_arg(args, UINTMAX_T);

-					break;

-				case PRINT_C_PTRDIFF:

-					value = va_arg(args, UPTRDIFF_T);

-					break;

-				default:

-					value = va_arg(args, unsigned int);

-					break;

-				}

-				fmtint(str, &len, size, value, base, width,

-				    precision, flags);

-				break;

-			case 'A':

-				/* Not yet supported, we'll use "%F". */

-				/* FALLTHROUGH */

-			case 'F':

-				flags |= PRINT_F_UP;

-			case 'a':

-				/* Not yet supported, we'll use "%f". */

-				/* FALLTHROUGH */

-			case 'f':

-				if (cflags == PRINT_C_LDOUBLE)

-					fvalue = va_arg(args, LDOUBLE);

-				else

-					fvalue = va_arg(args, double);

-				fmtflt(str, &len, size, fvalue, width,

-				    precision, flags, &overflow);

-				if (overflow)

-					goto out;

-				break;

-			case 'E':

-				flags |= PRINT_F_UP;

-				/* FALLTHROUGH */

-			case 'e':

-				flags |= PRINT_F_TYPE_E;

-				if (cflags == PRINT_C_LDOUBLE)

-					fvalue = va_arg(args, LDOUBLE);

-				else

-					fvalue = va_arg(args, double);

-				fmtflt(str, &len, size, fvalue, width,

-				    precision, flags, &overflow);

-				if (overflow)

-					goto out;

-				break;

-			case 'G':

-				flags |= PRINT_F_UP;

-				/* FALLTHROUGH */

-			case 'g':

-				flags |= PRINT_F_TYPE_G;

-				if (cflags == PRINT_C_LDOUBLE)

-					fvalue = va_arg(args, LDOUBLE);

-				else

-					fvalue = va_arg(args, double);

-				/*

-				 * If the precision is zero, it is treated as

-				 * one (cf. C99: 7.19.6.1, 8).

-				 */

-				if (precision == 0)

-					precision = 1;

-				fmtflt(str, &len, size, fvalue, width,

-				    precision, flags, &overflow);

-				if (overflow)

-					goto out;

-				break;

-			case 'c':

-				cvalue = (unsigned char)va_arg(args, int);

-				OUTCHAR(str, len, size, cvalue);

-				break;

-			case 's':

-				strvalue = va_arg(args, char *);

-				fmtstr(str, &len, size, strvalue, width,

-				    precision, flags);

-				break;

-			case 'p':

-				/*

-				 * C99 says: "The value of the pointer is

-				 * converted to a sequence of printing

-				 * characters, in an implementation-defined

-				 * manner." (C99: 7.19.6.1, 8)

-				 */

-				if ((strvalue = va_arg(args, void *)) == NULL)

-					/*

-					 * We use the glibc format.  BSD prints

-					 * "0x0", SysV "0".

-					 */

-					fmtstr(str, &len, size, "(nil)", width,

-					    -1, flags);

-				else {

-					/*

-					 * We use the BSD/glibc format.  SysV

-					 * omits the "0x" prefix (which we emit

-					 * using the PRINT_F_NUM flag).

-					 */

-					flags |= PRINT_F_NUM;

-					flags |= PRINT_F_UNSIGNED;

-					fmtint(str, &len, size,

-					    (UINTPTR_T)strvalue, 16, width,

-					    precision, flags);

-				}

-				break;

-			case 'n':

-				switch (cflags) {

-				case PRINT_C_CHAR:

-					charptr = va_arg(args, signed char *);

-					*charptr = (signed char)len;

-					break;

-				case PRINT_C_SHORT:

-					shortptr = va_arg(args, short int *);

-					*shortptr = (short int)len;

-					break;

-				case PRINT_C_LONG:

-					longptr = va_arg(args, long int *);

-					*longptr = (long int)len;

-					break;

-				case PRINT_C_LLONG:

-					llongptr = va_arg(args, LLONG *);

-					*llongptr = (LLONG)len;

-					break;

-				case PRINT_C_SIZE:

-					/*

-					 * C99 says that with the "z" length

-					 * modifier, "a following `n' conversion

-					 * specifier applies to a pointer to a

-					 * signed integer type corresponding to

-					 * size_t argument." (7.19.6.1, 7)

-					 */

-					sizeptr = va_arg(args, SSIZE_T *);

-					*sizeptr = len;

-					break;

-				case PRINT_C_INTMAX:

-					intmaxptr = va_arg(args, INTMAX_T *);

-					*intmaxptr = len;

-					break;

-				case PRINT_C_PTRDIFF:

-					ptrdiffptr = va_arg(args, PTRDIFF_T *);

-					*ptrdiffptr = len;

-					break;

-				default:

-					intptr = va_arg(args, int *);

-					*intptr = (int)len;

-					break;

-				}

-				break;

-			case '%':	/* Print a "%" character verbatim. */

-				OUTCHAR(str, len, size, ch);

-				break;

-			default:	/* Skip other characters. */

-				break;

-			}

-			ch = *format++;

-			state = PRINT_S_DEFAULT;

-			base = cflags = flags = width = 0;

-			precision = -1;

-			break;

-		}

-out:

-	if (len < size)

-		str[len] = '\0';

-	else if (size > 0)

-		str[size - 1] = '\0';

-

-	if (overflow || len >= INT_MAX) {

-		return -1;

-	}

-	return (int)len;

-}

-

-static void

-fmtstr(char *str, size_t *len, size_t size, const char *value, int width,

-       int precision, int flags)

-{

-	int padlen, strln;	/* Amount to pad. */

-	int noprecision = (precision == -1);

-

-	if (value == NULL)	/* We're forgiving. */

-		value = "(null)";

-

-	/* If a precision was specified, don't read the string past it. */

-	for (strln = 0; value[strln] != '\0' &&

-	    (noprecision || strln < precision); strln++)

-		continue;

-

-	if ((padlen = width - strln) < 0)

-		padlen = 0;

-	if (flags & PRINT_F_MINUS)	/* Left justify. */

-		padlen = -padlen;

-

-	while (padlen > 0) {	/* Leading spaces. */

-		OUTCHAR(str, *len, size, ' ');

-		padlen--;

-	}

-	while (*value != '\0' && (noprecision || precision-- > 0)) {

-		OUTCHAR(str, *len, size, *value);

-		value++;

-	}

-	while (padlen < 0) {	/* Trailing spaces. */

-		OUTCHAR(str, *len, size, ' ');

-		padlen++;

-	}

-}

-

-static void

-fmtint(char *str, size_t *len, size_t size, INTMAX_T value, int base, int width,

-       int precision, int flags)

-{

-	UINTMAX_T uvalue;

-	char iconvert[MAX_CONVERT_LENGTH];

-	char sign = 0;

-	char hexprefix = 0;

-	int spadlen = 0;	/* Amount to space pad. */

-	int zpadlen = 0;	/* Amount to zero pad. */

-	int pos;

-	int separators = (flags & PRINT_F_QUOTE);

-	int noprecision = (precision == -1);

-

-	if (flags & PRINT_F_UNSIGNED)

-		uvalue = value;

-	else {

-		uvalue = (value >= 0) ? value : -value;

-		if (value < 0)

-			sign = '-';

-		else if (flags & PRINT_F_PLUS)	/* Do a sign. */

-			sign = '+';

-		else if (flags & PRINT_F_SPACE)

-			sign = ' ';

-	}

-

-	pos = convert(uvalue, iconvert, sizeof(iconvert), base,

-	    flags & PRINT_F_UP);

-

-	if (flags & PRINT_F_NUM && uvalue != 0) {

-		/*

-		 * C99 says: "The result is converted to an `alternative form'.

-		 * For `o' conversion, it increases the precision, if and only

-		 * if necessary, to force the first digit of the result to be a

-		 * zero (if the value and precision are both 0, a single 0 is

-		 * printed).  For `x' (or `X') conversion, a nonzero result has

-		 * `0x' (or `0X') prefixed to it." (7.19.6.1, 6)

-		 */

-		switch (base) {

-		case 8:

-			if (precision <= pos)

-				precision = pos + 1;

-			break;

-		case 16:

-			hexprefix = (flags & PRINT_F_UP) ? 'X' : 'x';

-			break;

-		}

-	}

-

-	if (separators)	/* Get the number of group separators we'll print. */

-		separators = getnumsep(pos);

-

-	zpadlen = precision - pos - separators;

-	spadlen = width                         /* Minimum field width. */

-	    - separators                        /* Number of separators. */

-	    - MAX(precision, pos)               /* Number of integer digits. */

-	    - ((sign != 0) ? 1 : 0)             /* Will we print a sign? */

-	    - ((hexprefix != 0) ? 2 : 0);       /* Will we print a prefix? */

-

-	if (zpadlen < 0)

-		zpadlen = 0;

-	if (spadlen < 0)

-		spadlen = 0;

-

-	/*

-	 * C99 says: "If the `0' and `-' flags both appear, the `0' flag is

-	 * ignored.  For `d', `i', `o', `u', `x', and `X' conversions, if a

-	 * precision is specified, the `0' flag is ignored." (7.19.6.1, 6)

-	 */

-	if (flags & PRINT_F_MINUS)	/* Left justify. */

-		spadlen = -spadlen;

-	else if (flags & PRINT_F_ZERO && noprecision) {

-		zpadlen += spadlen;

-		spadlen = 0;

-	}

-	while (spadlen > 0) {	/* Leading spaces. */

-		OUTCHAR(str, *len, size, ' ');

-		spadlen--;

-	}

-	if (sign != 0)	/* Sign. */

-		OUTCHAR(str, *len, size, sign);

-	if (hexprefix != 0) {	/* A "0x" or "0X" prefix. */

-		OUTCHAR(str, *len, size, '0');

-		OUTCHAR(str, *len, size, hexprefix);

-	}

-	while (zpadlen > 0) {	/* Leading zeros. */

-		OUTCHAR(str, *len, size, '0');

-		zpadlen--;

-	}

-	while (pos > 0) {	/* The actual digits. */

-		pos--;

-		OUTCHAR(str, *len, size, iconvert[pos]);

-		if (separators > 0 && pos > 0 && pos % 3 == 0)

-			printsep(str, len, size);

-	}

-	while (spadlen < 0) {	/* Trailing spaces. */

-		OUTCHAR(str, *len, size, ' ');

-		spadlen++;

-	}

-}

-

-static void

-fmtflt(char *str, size_t *len, size_t size, LDOUBLE fvalue, int width,

-       int precision, int flags, int *overflow)

-{

-	LDOUBLE ufvalue;

-	UINTMAX_T intpart;

-	UINTMAX_T fracpart;

-	UINTMAX_T mask;

-	const char *infnan = NULL;

-	char iconvert[MAX_CONVERT_LENGTH];

-	char fconvert[MAX_CONVERT_LENGTH];

-	char econvert[4];	/* "e-12" (without nul-termination). */

-	char esign = 0;

-	char sign = 0;

-	int leadfraczeros = 0;

-	int exponent = 0;

-	int emitpoint = 0;

-	int omitzeros = 0;

-	int omitcount = 0;

-	int padlen = 0;

-	int epos = 0;

-	int fpos = 0;

-	int ipos = 0;

-	int separators = (flags & PRINT_F_QUOTE);

-	int estyle = (flags & PRINT_F_TYPE_E);

-#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT

-	struct lconv *lc = localeconv();

-#endif	/* HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT */

-

-	/*

-	 * AIX' man page says the default is 0, but C99 and at least Solaris'

-	 * and NetBSD's man pages say the default is 6, and sprintf(3) on AIX

-	 * defaults to 6.

-	 */

-	if (precision == -1)

-		precision = 6;

-

-	if (fvalue < 0.0)

-		sign = '-';

-	else if (flags & PRINT_F_PLUS)	/* Do a sign. */

-		sign = '+';

-	else if (flags & PRINT_F_SPACE)

-		sign = ' ';

-

-	if (ISNAN(fvalue))

-		infnan = (flags & PRINT_F_UP) ? "NAN" : "nan";

-	else if (ISINF(fvalue))

-		infnan = (flags & PRINT_F_UP) ? "INF" : "inf";

-

-	if (infnan != NULL) {

-		if (sign != 0)

-			iconvert[ipos++] = sign;

-		while (*infnan != '\0')

-			iconvert[ipos++] = *infnan++;

-		fmtstr(str, len, size, iconvert, width, ipos, flags);

-		return;

-	}

-

-	/* "%e" (or "%E") or "%g" (or "%G") conversion. */

-	if (flags & PRINT_F_TYPE_E || flags & PRINT_F_TYPE_G) {

-		if (flags & PRINT_F_TYPE_G) {

-			/*

-			 * For "%g" (and "%G") conversions, the precision

-			 * specifies the number of significant digits, which

-			 * includes the digits in the integer part.  The

-			 * conversion will or will not be using "e-style" (like

-			 * "%e" or "%E" conversions) depending on the precision

-			 * and on the exponent.  However, the exponent can be

-			 * affected by rounding the converted value, so we'll

-			 * leave this decision for later.  Until then, we'll

-			 * assume that we're going to do an "e-style" conversion

-			 * (in order to get the exponent calculated).  For

-			 * "e-style", the precision must be decremented by one.

-			 */

-			precision--;

-			/*

-			 * For "%g" (and "%G") conversions, trailing zeros are

-			 * removed from the fractional portion of the result

-			 * unless the "#" flag was specified.

-			 */

-			if (!(flags & PRINT_F_NUM))

-				omitzeros = 1;

-		}

-		exponent = getexponent(fvalue);

-		estyle = 1;

-	}

-

-again:

-	/*

-	 * Sorry, we only support 9, 19, or 38 digits (that is, the number of

-	 * digits of the 32-bit, the 64-bit, or the 128-bit UINTMAX_MAX value

-	 * minus one) past the decimal point due to our conversion method.

-	 */

-	switch (sizeof(UINTMAX_T)) {

-	case 16:

-		if (precision > 38)

-			precision = 38;

-		break;

-	case 8:

-		if (precision > 19)

-			precision = 19;

-		break;

-	default:

-		if (precision > 9)

-			precision = 9;

-		break;

-	}

-

-	ufvalue = (fvalue >= 0.0) ? fvalue : -fvalue;

-	if (estyle)	/* We want exactly one integer digit. */

-		ufvalue /= mypow10(exponent);

-

-	if ((intpart = cast(ufvalue)) == UINTMAX_MAX) {

-		*overflow = 1;

-		return;

-	}

-

-	/*

-	 * Factor of ten with the number of digits needed for the fractional

-	 * part.  For example, if the precision is 3, the mask will be 1000.

-	 */

-#if defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)

-	mask = (unsigned long)mypow10(precision);

-#else

-	mask = (UINTMAX_T)mypow10(precision);

-#endif

-	/*

-	 * We "cheat" by converting the fractional part to integer by

-	 * multiplying by a factor of ten.

-	 */

-	if ((fracpart = myround(mask * (ufvalue - intpart))) >= mask) {

-		/*

-		 * For example, ufvalue = 2.99962, intpart = 2, and mask = 1000

-		 * (because precision = 3).  Now, myround(1000 * 0.99962) will

-		 * return 1000.  So, the integer part must be incremented by one

-		 * and the fractional part must be set to zero.

-		 */

-		intpart++;

-		fracpart = 0;

-		if (estyle && intpart == 10) {

-			/*

-			 * The value was rounded up to ten, but we only want one

-			 * integer digit if using "e-style".  So, the integer

-			 * part must be set to one and the exponent must be

-			 * incremented by one.

-			 */

-			intpart = 1;

-			exponent++;

-		}

-	}

-

-	/*

-	 * Now that we know the real exponent, we can check whether or not to

-	 * use "e-style" for "%g" (and "%G") conversions.  If we don't need

-	 * "e-style", the precision must be adjusted and the integer and

-	 * fractional parts must be recalculated from the original value.

-	 *

-	 * C99 says: "Let P equal the precision if nonzero, 6 if the precision

-	 * is omitted, or 1 if the precision is zero.  Then, if a conversion

-	 * with style `E' would have an exponent of X:

-	 *

-	 * - if P > X >= -4, the conversion is with style `f' (or `F') and

-	 *   precision P - (X + 1).

-	 *

-	 * - otherwise, the conversion is with style `e' (or `E') and precision

-	 *   P - 1." (7.19.6.1, 8)

-	 *

-	 * Note that we had decremented the precision by one.

-	 */

-	if (flags & PRINT_F_TYPE_G && estyle &&

-	    precision + 1 > exponent && exponent >= -4) {

-		precision -= exponent;

-		estyle = 0;

-		goto again;

-	}

-

-	if (estyle) {

-		if (exponent < 0) {

-			exponent = -exponent;

-			esign = '-';

-		} else

-			esign = '+';

-

-		/*

-		 * Convert the exponent.  The sizeof(econvert) is 4.  So, the

-		 * econvert buffer can hold e.g. "e+99" and "e-99".  We don't

-		 * support an exponent which contains more than two digits.

-		 * Therefore, the following stores are safe.

-		 */

-		epos = convert(exponent, econvert, 2, 10, 0);

-		/*

-		 * C99 says: "The exponent always contains at least two digits,

-		 * and only as many more digits as necessary to represent the

-		 * exponent." (7.19.6.1, 8)

-		 */

-		if (epos == 1)

-			econvert[epos++] = '0';

-		econvert[epos++] = esign;

-		econvert[epos++] = (flags & PRINT_F_UP) ? 'E' : 'e';

-	}

-

-	/* Convert the integer part and the fractional part. */

-	ipos = convert(intpart, iconvert, sizeof(iconvert), 10, 0);

-	if (fracpart != 0)	/* convert() would return 1 if fracpart == 0. */

-		fpos = convert(fracpart, fconvert, sizeof(fconvert), 10, 0);

-

-	leadfraczeros = precision - fpos;

-

-	if (omitzeros) {

-		if (fpos > 0)	/* Omit trailing fractional part zeros. */

-			while (omitcount < fpos && fconvert[omitcount] == '0')

-				omitcount++;

-		else {	/* The fractional part is zero, omit it completely. */

-			omitcount = precision;

-			leadfraczeros = 0;

-		}

-		precision -= omitcount;

-	}

-

-	/*

-	 * Print a decimal point if either the fractional part is non-zero

-	 * and/or the "#" flag was specified.

-	 */

-	if (precision > 0 || flags & PRINT_F_NUM)

-		emitpoint = 1;

-	if (separators)	/* Get the number of group separators we'll print. */

-		separators = getnumsep(ipos);

-

-	padlen = width                  /* Minimum field width. */

-	    - ipos                      /* Number of integer digits. */

-	    - epos                      /* Number of exponent characters. */

-	    - precision                 /* Number of fractional digits. */

-	    - separators                /* Number of group separators. */

-	    - (emitpoint ? 1 : 0)       /* Will we print a decimal point? */

-	    - ((sign != 0) ? 1 : 0);    /* Will we print a sign character? */

-

-	if (padlen < 0)

-		padlen = 0;

-

-	/*

-	 * C99 says: "If the `0' and `-' flags both appear, the `0' flag is

-	 * ignored." (7.19.6.1, 6)

-	 */

-	if (flags & PRINT_F_MINUS)	/* Left justifty. */

-		padlen = -padlen;

-	else if (flags & PRINT_F_ZERO && padlen > 0) {

-		if (sign != 0) {	/* Sign. */

-			OUTCHAR(str, *len, size, sign);

-			sign = 0;

-		}

-		while (padlen > 0) {	/* Leading zeros. */

-			OUTCHAR(str, *len, size, '0');

-			padlen--;

-		}

-	}

-	while (padlen > 0) {	/* Leading spaces. */

-		OUTCHAR(str, *len, size, ' ');

-		padlen--;

-	}

-	if (sign != 0)	/* Sign. */

-		OUTCHAR(str, *len, size, sign);

-	while (ipos > 0) {	/* Integer part. */

-		ipos--;

-		OUTCHAR(str, *len, size, iconvert[ipos]);

-		if (separators > 0 && ipos > 0 && ipos % 3 == 0)

-			printsep(str, len, size);

-	}

-	if (emitpoint) {	/* Decimal point. */

-#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT

-		if (lc->decimal_point != NULL && *lc->decimal_point != '\0')

-			OUTCHAR(str, *len, size, *lc->decimal_point);

-		else	/* We'll always print some decimal point character. */

-#endif	/* HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT */

-			OUTCHAR(str, *len, size, '.');

-	}

-	while (leadfraczeros > 0) {	/* Leading fractional part zeros. */

-		OUTCHAR(str, *len, size, '0');

-		leadfraczeros--;

-	}

-	while (fpos > omitcount) {	/* The remaining fractional part. */

-		fpos--;

-		OUTCHAR(str, *len, size, fconvert[fpos]);

-	}

-	while (epos > 0) {	/* Exponent. */

-		epos--;

-		OUTCHAR(str, *len, size, econvert[epos]);

-	}

-	while (padlen < 0) {	/* Trailing spaces. */

-		OUTCHAR(str, *len, size, ' ');

-		padlen++;

-	}

-}

-

-static void

-printsep(char *str, size_t *len, size_t size)

-{

-#if HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP

-	struct lconv *lc = localeconv();

-	int i;

-

-	if (lc->thousands_sep != NULL)

-		for (i = 0; lc->thousands_sep[i] != '\0'; i++)

-			OUTCHAR(str, *len, size, lc->thousands_sep[i]);

-	else

-#endif	/* HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP */

-		OUTCHAR(str, *len, size, ',');

-}

-

-static int

-getnumsep(int digits)

-{

-	int separators = (digits - ((digits % 3 == 0) ? 1 : 0)) / 3;

-#if HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP

-	int strln;

-	struct lconv *lc = localeconv();

-

-	/* We support an arbitrary separator length (including zero). */

-	if (lc->thousands_sep != NULL) {

-		for (strln = 0; lc->thousands_sep[strln] != '\0'; strln++)

-			continue;

-		separators *= strln;

-	}

-#endif	/* HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP */

-	return separators;

-}

-

-static int

-getexponent(LDOUBLE value)

-{

-	LDOUBLE tmp = (value >= 0.0) ? value : -value;

-	int exponent = 0;

-

-	/*

-	 * We check for 99 > exponent > -99 in order to work around possible

-	 * endless loops which could happen (at least) in the second loop (at

-	 * least) if we're called with an infinite value.  However, we checked

-	 * for infinity before calling this function using our ISINF() macro, so

-	 * this might be somewhat paranoid.

-	 */

-	while (tmp < 1.0 && tmp > 0.0 && --exponent > -99)

-		tmp *= 10;

-	while (tmp >= 10.0 && ++exponent < 99)

-		tmp /= 10;

-

-	return exponent;

-}

-

-static int

-convert(UINTMAX_T value, char *buf, size_t size, int base, int caps)

-{

-	const char *digits = caps ? "0123456789ABCDEF" : "0123456789abcdef";

-	size_t pos = 0;

-

-	/* We return an unterminated buffer with the digits in reverse order. */

-	do {

-		buf[pos++] = digits[value % base];

-		value /= base;

-	} while (value != 0 && pos < size);

-

-	return (int)pos;

-}

-

-static UINTMAX_T

-cast(LDOUBLE value)

-{

-	UINTMAX_T result;

-

-	/*

-	 * We check for ">=" and not for ">" because if UINTMAX_MAX cannot be

-	 * represented exactly as an LDOUBLE value (but is less than LDBL_MAX),

-	 * it may be increased to the nearest higher representable value for the

-	 * comparison (cf. C99: 6.3.1.4, 2).  It might then equal the LDOUBLE

-	 * value although converting the latter to UINTMAX_T would overflow.

-	 */

-	if (value >= UINTMAX_MAX)

-		return UINTMAX_MAX;

-

-#if defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)

-	result = (unsigned long)value;

-#else

-	result = (UINTMAX_T)value;

-#endif

-	/*

-	 * At least on NetBSD/sparc64 3.0.2 and 4.99.30, casting long double to

-	 * an integer type converts e.g. 1.9 to 2 instead of 1 (which violates

-	 * the standard).  Sigh.

-	 */

-	return (result <= value) ? result : result - 1;

-}

-

-static UINTMAX_T

-myround(LDOUBLE value)

-{

-	UINTMAX_T intpart = cast(value);

-

-	return ((value -= intpart) < 0.5) ? intpart : intpart + 1;

-}

-

-static LDOUBLE

-mypow10(int exponent)

-{

-	LDOUBLE result = 1;

-

-	while (exponent > 0) {

-		result *= 10;

-		exponent--;

-	}

-	while (exponent < 0) {

-		result /= 10;

-		exponent++;

-	}

-	return result;

-}

-#endif	/* !HAVE_VSNPRINTF */

-

-#if !HAVE_VASPRINTF

-#if NEED_MYMEMCPY

-void *

-mymemcpy(void *dst, void *src, size_t len)

-{

-	const char *from = src;

-	char *to = dst;

-

-	/* No need for optimization, we use this only to replace va_copy(3). */

-	while (len-- > 0)

-		*to++ = *from++;

-	return dst;

-}

-#endif	/* NEED_MYMEMCPY */

-

-int

-util_vasprintf(char **ret, const char *format, va_list ap)

-{

-	size_t size;

-	int len;

-	va_list aq;

-

-	VA_COPY(aq, ap);

-	len = vsnprintf(NULL, 0, format, aq);

-	VA_END_COPY(aq);

-	if (len < 0 || (*ret = malloc(size = len + 1)) == NULL)

-		return -1;

-	return vsnprintf(*ret, size, format, ap);

-}

-#endif	/* !HAVE_VASPRINTF */

-

-#if !HAVE_SNPRINTF

-#if HAVE_STDARG_H

-int

-util_snprintf(char *str, size_t size, const char *format, ...)

-#else

-int

-util_snprintf(va_alist) va_dcl

-#endif	/* HAVE_STDARG_H */

-{

-#if !HAVE_STDARG_H

-	char *str;

-	size_t size;

-	char *format;

-#endif	/* HAVE_STDARG_H */

-	va_list ap;

-	int len;

-

-	VA_START(ap, format);

-	VA_SHIFT(ap, str, char *);

-	VA_SHIFT(ap, size, size_t);

-	VA_SHIFT(ap, format, const char *);

-	len = vsnprintf(str, size, format, ap);

-	va_end(ap);

-	return len;

-}

-#endif	/* !HAVE_SNPRINTF */

-

-#if !HAVE_ASPRINTF

-#if HAVE_STDARG_H

-int

-util_asprintf(char **ret, const char *format, ...)

-#else

-int

-util_asprintf(va_alist) va_dcl

-#endif	/* HAVE_STDARG_H */

-{

-#if !HAVE_STDARG_H

-	char **ret;

-	char *format;

-#endif	/* HAVE_STDARG_H */

-	va_list ap;

-	int len;

-

-	VA_START(ap, format);

-	VA_SHIFT(ap, ret, char **);

-	VA_SHIFT(ap, format, const char *);

-	len = vasprintf(ret, format, ap);

-	va_end(ap);

-	return len;

-}

-#endif	/* !HAVE_ASPRINTF */

-#else	/* Dummy declaration to avoid empty translation unit warnings. */

-int main(void);

-#endif	/* !HAVE_SNPRINTF || !HAVE_VSNPRINTF || !HAVE_ASPRINTF || [...] */

-

-

-/* vim: set joinspaces textwidth=80: */

+/*
+ * Copyright (c) 1995 Patrick Powell.
+ *
+ * This code is based on code written by Patrick Powell <papowell@astart.com>.
+ * It may be used for any purpose as long as this notice remains intact on all
+ * source code distributions.
+ */
+
+/*
+ * Copyright (c) 2008 Holger Weiss.
+ *
+ * This version of the code is maintained by Holger Weiss <holger@jhweiss.de>.
+ * My changes to the code may freely be used, modified and/or redistributed for
+ * any purpose.  It would be nice if additions and fixes to this file (including
+ * trivial code cleanups) would be sent back in order to let me include them in
+ * the version available at <http://www.jhweiss.de/software/snprintf.html>.
+ * However, this is not a requirement for using or redistributing (possibly
+ * modified) versions of this file, nor is leaving this notice intact mandatory.
+ */
+
+/*
+ * History
+ *
+ * 2008-01-20 Holger Weiss <holger@jhweiss.de> for C99-snprintf 1.1:
+ *
+ * 	Fixed the detection of infinite floating point values on IRIX (and
+ * 	possibly other systems) and applied another few minor cleanups.
+ *
+ * 2008-01-06 Holger Weiss <holger@jhweiss.de> for C99-snprintf 1.0:
+ *
+ * 	Added a lot of new features, fixed many bugs, and incorporated various
+ * 	improvements done by Andrew Tridgell <tridge@samba.org>, Russ Allbery
+ * 	<rra@stanford.edu>, Hrvoje Niksic <hniksic@xemacs.org>, Damien Miller
+ * 	<djm@mindrot.org>, and others for the Samba, INN, Wget, and OpenSSH
+ * 	projects.  The additions include: support the "e", "E", "g", "G", and
+ * 	"F" conversion specifiers (and use conversion style "f" or "F" for the
+ * 	still unsupported "a" and "A" specifiers); support the "hh", "ll", "j",
+ * 	"t", and "z" length modifiers; support the "#" flag and the (non-C99)
+ * 	"'" flag; use localeconv(3) (if available) to get both the current
+ * 	locale's decimal point character and the separator between groups of
+ * 	digits; fix the handling of various corner cases of field width and
+ * 	precision specifications; fix various floating point conversion bugs;
+ * 	handle infinite and NaN floating point values; don't attempt to write to
+ * 	the output buffer (which may be NULL) if a size of zero was specified;
+ * 	check for integer overflow of the field width, precision, and return
+ * 	values and during the floating point conversion; use the OUTCHAR() macro
+ * 	instead of a function for better performance; provide asprintf(3) and
+ * 	vasprintf(3) functions; add new test cases.  The replacement functions
+ * 	have been renamed to use an "rpl_" prefix, the function calls in the
+ * 	main project (and in this file) must be redefined accordingly for each
+ * 	replacement function which is needed (by using Autoconf or other means).
+ * 	Various other minor improvements have been applied and the coding style
+ * 	was cleaned up for consistency.
+ *
+ * 2007-07-23 Holger Weiss <holger@jhweiss.de> for Mutt 1.5.13:
+ *
+ * 	C99 compliant snprintf(3) and vsnprintf(3) functions return the number
+ * 	of characters that would have been written to a sufficiently sized
+ * 	buffer (excluding the '\0').  The original code simply returned the
+ * 	length of the resulting output string, so that's been fixed.
+ *
+ * 1998-03-05 Michael Elkins <me@mutt.org> for Mutt 0.90.8:
+ *
+ * 	The original code assumed that both snprintf(3) and vsnprintf(3) were
+ * 	missing.  Some systems only have snprintf(3) but not vsnprintf(3), so
+ * 	the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
+ *
+ * 1998-01-27 Thomas Roessler <roessler@does-not-exist.org> for Mutt 0.89i:
+ *
+ * 	The PGP code was using unsigned hexadecimal formats.  Unfortunately,
+ * 	unsigned formats simply didn't work.
+ *
+ * 1997-10-22 Brandon Long <blong@fiction.net> for Mutt 0.87.1:
+ *
+ * 	Ok, added some minimal floating point support, which means this probably
+ * 	requires libm on most operating systems.  Don't yet support the exponent
+ * 	(e,E) and sigfig (g,G).  Also, fmtint() was pretty badly broken, it just
+ * 	wasn't being exercised in ways which showed it, so that's been fixed.
+ * 	Also, formatted the code to Mutt conventions, and removed dead code left
+ * 	over from the original.  Also, there is now a builtin-test, run with:
+ * 	gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm && ./snprintf
+ *
+ * 2996-09-15 Brandon Long <blong@fiction.net> for Mutt 0.43:
+ *
+ * 	This was ugly.  It is still ugly.  I opted out of floating point
+ * 	numbers, but the formatter understands just about everything from the
+ * 	normal C string format, at least as far as I can tell from the Solaris
+ * 	2.5 printf(3S) man page.
+ */
+
+/*
+ * ToDo
+ *
+ * - Add wide character support.
+ * - Add support for "%a" and "%A" conversions.
+ * - Create test routines which predefine the expected results.  Our test cases
+ *   usually expose bugs in system implementations rather than in ours :-)
+ */
+
+/*
+ * Usage
+ *
+ * 1) The following preprocessor macros should be defined to 1 if the feature or
+ *    file in question is available on the target system (by using Autoconf or
+ *    other means), though basic functionality should be available as long as
+ *    HAVE_STDARG_H and HAVE_STDLIB_H are defined correctly:
+ *
+ *    	HAVE_VSNPRINTF
+ *    	HAVE_SNPRINTF
+ *    	HAVE_VASPRINTF
+ *    	HAVE_ASPRINTF
+ *    	HAVE_STDARG_H
+ *    	HAVE_STDDEF_H
+ *    	HAVE_STDINT_H
+ *    	HAVE_STDLIB_H
+ *    	HAVE_INTTYPES_H
+ *    	HAVE_LOCALE_H
+ *    	HAVE_LOCALECONV
+ *    	HAVE_LCONV_DECIMAL_POINT
+ *    	HAVE_LCONV_THOUSANDS_SEP
+ *    	HAVE_LONG_DOUBLE
+ *    	HAVE_LONG_LONG_INT
+ *    	HAVE_UNSIGNED_LONG_LONG_INT
+ *    	HAVE_INTMAX_T
+ *    	HAVE_UINTMAX_T
+ *    	HAVE_UINTPTR_T
+ *    	HAVE_PTRDIFF_T
+ *    	HAVE_VA_COPY
+ *    	HAVE___VA_COPY
+ *
+ * 2) The calls to the functions which should be replaced must be redefined
+ *    throughout the project files (by using Autoconf or other means):
+ *
+ *    	#define vsnprintf rpl_vsnprintf
+ *    	#define snprintf rpl_snprintf
+ *    	#define vasprintf rpl_vasprintf
+ *    	#define asprintf rpl_asprintf
+ *
+ * 3) The required replacement functions should be declared in some header file
+ *    included throughout the project files:
+ *
+ *    	#if HAVE_CONFIG_H
+ *    	#include <config.h>
+ *    	#endif
+ *    	#if HAVE_STDARG_H
+ *    	#include <stdarg.h>
+ *    	#if !HAVE_VSNPRINTF
+ *    	int rpl_vsnprintf(char *, size_t, const char *, va_list);
+ *    	#endif
+ *    	#if !HAVE_SNPRINTF
+ *    	int rpl_snprintf(char *, size_t, const char *, ...);
+ *    	#endif
+ *    	#if !HAVE_VASPRINTF
+ *    	int rpl_vasprintf(char **, const char *, va_list);
+ *    	#endif
+ *    	#if !HAVE_ASPRINTF
+ *    	int rpl_asprintf(char **, const char *, ...);
+ *    	#endif
+ *    	#endif
+ *
+ * Autoconf macros for handling step 1 and step 2 are available at
+ * <http://www.jhweiss.de/software/snprintf.html>.
+ */
+
+#include "pipe/p_config.h"
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#else
+#ifdef WIN32
+#define vsnprintf util_vsnprintf
+#define snprintf util_snprintf
+#define HAVE_VSNPRINTF 0
+#define HAVE_SNPRINTF 0
+#define HAVE_VASPRINTF 1 /* not needed */
+#define HAVE_ASPRINTF 1 /* not needed */
+#define HAVE_STDARG_H 1
+#define HAVE_STDDEF_H 1
+#define HAVE_STDINT_H 0
+#define HAVE_STDLIB_H 1
+#define HAVE_INTTYPES_H 0
+#define HAVE_LOCALE_H 0
+#define HAVE_LOCALECONV 0
+#define HAVE_LCONV_DECIMAL_POINT 0
+#define HAVE_LCONV_THOUSANDS_SEP 0
+#define HAVE_LONG_DOUBLE 0
+#define HAVE_LONG_LONG_INT 1
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+#define HAVE_INTMAX_T 0
+#define HAVE_UINTMAX_T 0
+#define HAVE_UINTPTR_T 1
+#define HAVE_PTRDIFF_T 1
+#define HAVE_VA_COPY 0
+#define HAVE___VA_COPY 0
+#else
+#define HAVE_VSNPRINTF 1
+#define HAVE_SNPRINTF 1
+#define HAVE_VASPRINTF 1
+#define HAVE_ASPRINTF 1
+#endif
+#endif	/* HAVE_CONFIG_H */
+
+#if !HAVE_SNPRINTF || !HAVE_VSNPRINTF || !HAVE_ASPRINTF || !HAVE_VASPRINTF
+#include <stdio.h>	/* For NULL, size_t, vsnprintf(3), and vasprintf(3). */
+#ifdef VA_START
+#undef VA_START
+#endif	/* defined(VA_START) */
+#ifdef VA_SHIFT
+#undef VA_SHIFT
+#endif	/* defined(VA_SHIFT) */
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#define VA_START(ap, last) va_start(ap, last)
+#define VA_SHIFT(ap, value, type) /* No-op for ANSI C. */
+#else	/* Assume <varargs.h> is available. */
+#include <varargs.h>
+#define VA_START(ap, last) va_start(ap)	/* "last" is ignored. */
+#define VA_SHIFT(ap, value, type) value = va_arg(ap, type)
+#endif	/* HAVE_STDARG_H */
+
+#if !HAVE_VASPRINTF
+#if HAVE_STDLIB_H
+#include <stdlib.h>	/* For malloc(3). */
+#endif	/* HAVE_STDLIB_H */
+#ifdef VA_COPY
+#undef VA_COPY
+#endif	/* defined(VA_COPY) */
+#ifdef VA_END_COPY
+#undef VA_END_COPY
+#endif	/* defined(VA_END_COPY) */
+#if HAVE_VA_COPY
+#define VA_COPY(dest, src) va_copy(dest, src)
+#define VA_END_COPY(ap) va_end(ap)
+#elif HAVE___VA_COPY
+#define VA_COPY(dest, src) __va_copy(dest, src)
+#define VA_END_COPY(ap) va_end(ap)
+#else
+#define VA_COPY(dest, src) (void)mymemcpy(&dest, &src, sizeof(va_list))
+#define VA_END_COPY(ap) /* No-op. */
+#define NEED_MYMEMCPY 1
+static void *mymemcpy(void *, void *, size_t);
+#endif	/* HAVE_VA_COPY */
+#endif	/* !HAVE_VASPRINTF */
+
+#if !HAVE_VSNPRINTF
+#include <limits.h>	/* For *_MAX. */
+#if HAVE_INTTYPES_H
+#include <inttypes.h>	/* For intmax_t (if not defined in <stdint.h>). */
+#endif	/* HAVE_INTTYPES_H */
+#if HAVE_LOCALE_H
+#include <locale.h>	/* For localeconv(3). */
+#endif	/* HAVE_LOCALE_H */
+#if HAVE_STDDEF_H
+#include <stddef.h>	/* For ptrdiff_t. */
+#endif	/* HAVE_STDDEF_H */
+#if HAVE_STDINT_H
+#include <stdint.h>	/* For intmax_t. */
+#endif	/* HAVE_STDINT_H */
+
+/* Support for unsigned long long int.  We may also need ULLONG_MAX. */
+#ifndef ULONG_MAX	/* We may need ULONG_MAX as a fallback. */
+#ifdef UINT_MAX
+#define ULONG_MAX UINT_MAX
+#else
+#define ULONG_MAX INT_MAX
+#endif	/* defined(UINT_MAX) */
+#endif	/* !defined(ULONG_MAX) */
+#ifdef ULLONG
+#undef ULLONG
+#endif	/* defined(ULLONG) */
+#if HAVE_UNSIGNED_LONG_LONG_INT
+#define ULLONG unsigned long long int
+#ifndef ULLONG_MAX
+#define ULLONG_MAX ULONG_MAX
+#endif	/* !defined(ULLONG_MAX) */
+#else
+#define ULLONG unsigned long int
+#ifdef ULLONG_MAX
+#undef ULLONG_MAX
+#endif	/* defined(ULLONG_MAX) */
+#define ULLONG_MAX ULONG_MAX
+#endif	/* HAVE_LONG_LONG_INT */
+
+/* Support for uintmax_t.  We also need UINTMAX_MAX. */
+#ifdef UINTMAX_T
+#undef UINTMAX_T
+#endif	/* defined(UINTMAX_T) */
+#if HAVE_UINTMAX_T || defined(uintmax_t)
+#define UINTMAX_T uintmax_t
+#ifndef UINTMAX_MAX
+#define UINTMAX_MAX ULLONG_MAX
+#endif	/* !defined(UINTMAX_MAX) */
+#else
+#define UINTMAX_T ULLONG
+#ifdef UINTMAX_MAX
+#undef UINTMAX_MAX
+#endif	/* defined(UINTMAX_MAX) */
+#define UINTMAX_MAX ULLONG_MAX
+#endif	/* HAVE_UINTMAX_T || defined(uintmax_t) */
+
+/* Support for long double. */
+#ifndef LDOUBLE
+#if HAVE_LONG_DOUBLE
+#define LDOUBLE long double
+#else
+#define LDOUBLE double
+#endif	/* HAVE_LONG_DOUBLE */
+#endif	/* !defined(LDOUBLE) */
+
+/* Support for long long int. */
+#ifndef LLONG
+#if HAVE_LONG_LONG_INT
+#define LLONG long long int
+#else
+#define LLONG long int
+#endif	/* HAVE_LONG_LONG_INT */
+#endif	/* !defined(LLONG) */
+
+/* Support for intmax_t. */
+#ifndef INTMAX_T
+#if HAVE_INTMAX_T || defined(intmax_t)
+#define INTMAX_T intmax_t
+#else
+#define INTMAX_T LLONG
+#endif	/* HAVE_INTMAX_T || defined(intmax_t) */
+#endif	/* !defined(INTMAX_T) */
+
+/* Support for uintptr_t. */
+#ifndef UINTPTR_T
+#if HAVE_UINTPTR_T || defined(uintptr_t)
+#define UINTPTR_T uintptr_t
+#else
+#define UINTPTR_T unsigned long int
+#endif	/* HAVE_UINTPTR_T || defined(uintptr_t) */
+#endif	/* !defined(UINTPTR_T) */
+
+/* WinCE5.0 does not have uintptr_t defined */ 
+#if (_WIN32_WCE < 600) 
+#ifdef UINTPTR_T 
+#undef UINTPTR_T 
+#endif 
+#define UINTPTR_T unsigned long int 
+#endif 
+
+
+/* Support for ptrdiff_t. */
+#ifndef PTRDIFF_T
+#if HAVE_PTRDIFF_T || defined(ptrdiff_t)
+#define PTRDIFF_T ptrdiff_t
+#else
+#define PTRDIFF_T long int
+#endif	/* HAVE_PTRDIFF_T || defined(ptrdiff_t) */
+#endif	/* !defined(PTRDIFF_T) */
+
+/*
+ * We need an unsigned integer type corresponding to ptrdiff_t (cf. C99:
+ * 7.19.6.1, 7).  However, we'll simply use PTRDIFF_T and convert it to an
+ * unsigned type if necessary.  This should work just fine in practice.
+ */
+#ifndef UPTRDIFF_T
+#define UPTRDIFF_T PTRDIFF_T
+#endif	/* !defined(UPTRDIFF_T) */
+
+/*
+ * We need a signed integer type corresponding to size_t (cf. C99: 7.19.6.1, 7).
+ * However, we'll simply use size_t and convert it to a signed type if
+ * necessary.  This should work just fine in practice.
+ */
+#ifndef SSIZE_T
+#define SSIZE_T size_t
+#endif	/* !defined(SSIZE_T) */
+
+/* Either ERANGE or E2BIG should be available everywhere. */
+#ifndef ERANGE
+#define ERANGE E2BIG
+#endif	/* !defined(ERANGE) */
+#ifndef EOVERFLOW
+#define EOVERFLOW ERANGE
+#endif	/* !defined(EOVERFLOW) */
+
+/*
+ * Buffer size to hold the octal string representation of UINT128_MAX without
+ * nul-termination ("3777777777777777777777777777777777777777777").
+ */
+#ifdef MAX_CONVERT_LENGTH
+#undef MAX_CONVERT_LENGTH
+#endif	/* defined(MAX_CONVERT_LENGTH) */
+#define MAX_CONVERT_LENGTH      43
+
+/* Format read states. */
+#define PRINT_S_DEFAULT         0
+#define PRINT_S_FLAGS           1
+#define PRINT_S_WIDTH           2
+#define PRINT_S_DOT             3
+#define PRINT_S_PRECISION       4
+#define PRINT_S_MOD             5
+#define PRINT_S_CONV            6
+
+/* Format flags. */
+#define PRINT_F_MINUS           (1 << 0)
+#define PRINT_F_PLUS            (1 << 1)
+#define PRINT_F_SPACE           (1 << 2)
+#define PRINT_F_NUM             (1 << 3)
+#define PRINT_F_ZERO            (1 << 4)
+#define PRINT_F_QUOTE           (1 << 5)
+#define PRINT_F_UP              (1 << 6)
+#define PRINT_F_UNSIGNED        (1 << 7)
+#define PRINT_F_TYPE_G          (1 << 8)
+#define PRINT_F_TYPE_E          (1 << 9)
+
+/* Conversion flags. */
+#define PRINT_C_CHAR            1
+#define PRINT_C_SHORT           2
+#define PRINT_C_LONG            3
+#define PRINT_C_LLONG           4
+#define PRINT_C_LDOUBLE         5
+#define PRINT_C_SIZE            6
+#define PRINT_C_PTRDIFF         7
+#define PRINT_C_INTMAX          8
+
+#ifndef MAX
+#define MAX(x, y) ((x >= y) ? x : y)
+#endif	/* !defined(MAX) */
+#ifndef CHARTOINT
+#define CHARTOINT(ch) (ch - '0')
+#endif	/* !defined(CHARTOINT) */
+#ifndef ISDIGIT
+#define ISDIGIT(ch) ('0' <= (unsigned char)ch && (unsigned char)ch <= '9')
+#endif	/* !defined(ISDIGIT) */
+#ifndef ISNAN
+#define ISNAN(x) (x != x)
+#endif	/* !defined(ISNAN) */
+#ifndef ISINF
+#define ISINF(x) (x != 0.0 && x + x == x)
+#endif	/* !defined(ISINF) */
+
+#ifdef OUTCHAR
+#undef OUTCHAR
+#endif	/* defined(OUTCHAR) */
+#define OUTCHAR(str, len, size, ch)                                          \
+do {                                                                         \
+	if (len + 1 < size)                                                  \
+		str[len] = ch;                                               \
+	(len)++;                                                             \
+} while (/* CONSTCOND */ 0)
+
+static void fmtstr(char *, size_t *, size_t, const char *, int, int, int);
+static void fmtint(char *, size_t *, size_t, INTMAX_T, int, int, int, int);
+static void fmtflt(char *, size_t *, size_t, LDOUBLE, int, int, int, int *);
+static void printsep(char *, size_t *, size_t);
+static int getnumsep(int);
+static int getexponent(LDOUBLE);
+static int convert(UINTMAX_T, char *, size_t, int, int);
+static UINTMAX_T cast(LDOUBLE);
+static UINTMAX_T myround(LDOUBLE);
+static LDOUBLE mypow10(int);
+
+int
+util_vsnprintf(char *str, size_t size, const char *format, va_list args)
+{
+	LDOUBLE fvalue;
+	INTMAX_T value;
+	unsigned char cvalue;
+	const char *strvalue;
+	INTMAX_T *intmaxptr;
+	PTRDIFF_T *ptrdiffptr;
+	SSIZE_T *sizeptr;
+	LLONG *llongptr;
+	long int *longptr;
+	int *intptr;
+	short int *shortptr;
+	signed char *charptr;
+	size_t len = 0;
+	int overflow = 0;
+	int base = 0;
+	int cflags = 0;
+	int flags = 0;
+	int width = 0;
+	int precision = -1;
+	int state = PRINT_S_DEFAULT;
+	char ch = *format++;
+
+	/*
+	 * C99 says: "If `n' is zero, nothing is written, and `s' may be a null
+	 * pointer." (7.19.6.5, 2)  We're forgiving and allow a NULL pointer
+	 * even if a size larger than zero was specified.  At least NetBSD's
+	 * snprintf(3) does the same, as well as other versions of this file.
+	 * (Though some of these versions will write to a non-NULL buffer even
+	 * if a size of zero was specified, which violates the standard.)
+	 */
+	if (str == NULL && size != 0)
+		size = 0;
+
+	while (ch != '\0')
+		switch (state) {
+		case PRINT_S_DEFAULT:
+			if (ch == '%')
+				state = PRINT_S_FLAGS;
+			else
+				OUTCHAR(str, len, size, ch);
+			ch = *format++;
+			break;
+		case PRINT_S_FLAGS:
+			switch (ch) {
+			case '-':
+				flags |= PRINT_F_MINUS;
+				ch = *format++;
+				break;
+			case '+':
+				flags |= PRINT_F_PLUS;
+				ch = *format++;
+				break;
+			case ' ':
+				flags |= PRINT_F_SPACE;
+				ch = *format++;
+				break;
+			case '#':
+				flags |= PRINT_F_NUM;
+				ch = *format++;
+				break;
+			case '0':
+				flags |= PRINT_F_ZERO;
+				ch = *format++;
+				break;
+			case '\'':	/* SUSv2 flag (not in C99). */
+				flags |= PRINT_F_QUOTE;
+				ch = *format++;
+				break;
+			default:
+				state = PRINT_S_WIDTH;
+				break;
+			}
+			break;
+		case PRINT_S_WIDTH:
+			if (ISDIGIT(ch)) {
+				ch = CHARTOINT(ch);
+				if (width > (INT_MAX - ch) / 10) {
+					overflow = 1;
+					goto out;
+				}
+				width = 10 * width + ch;
+				ch = *format++;
+			} else if (ch == '*') {
+				/*
+				 * C99 says: "A negative field width argument is
+				 * taken as a `-' flag followed by a positive
+				 * field width." (7.19.6.1, 5)
+				 */
+				if ((width = va_arg(args, int)) < 0) {
+					flags |= PRINT_F_MINUS;
+					width = -width;
+				}
+				ch = *format++;
+				state = PRINT_S_DOT;
+			} else
+				state = PRINT_S_DOT;
+			break;
+		case PRINT_S_DOT:
+			if (ch == '.') {
+				state = PRINT_S_PRECISION;
+				ch = *format++;
+			} else
+				state = PRINT_S_MOD;
+			break;
+		case PRINT_S_PRECISION:
+			if (precision == -1)
+				precision = 0;
+			if (ISDIGIT(ch)) {
+				ch = CHARTOINT(ch);
+				if (precision > (INT_MAX - ch) / 10) {
+					overflow = 1;
+					goto out;
+				}
+				precision = 10 * precision + ch;
+				ch = *format++;
+			} else if (ch == '*') {
+				/*
+				 * C99 says: "A negative precision argument is
+				 * taken as if the precision were omitted."
+				 * (7.19.6.1, 5)
+				 */
+				if ((precision = va_arg(args, int)) < 0)
+					precision = -1;
+				ch = *format++;
+				state = PRINT_S_MOD;
+			} else
+				state = PRINT_S_MOD;
+			break;
+		case PRINT_S_MOD:
+			switch (ch) {
+			case 'h':
+				ch = *format++;
+				if (ch == 'h') {	/* It's a char. */
+					ch = *format++;
+					cflags = PRINT_C_CHAR;
+				} else
+					cflags = PRINT_C_SHORT;
+				break;
+			case 'l':
+				ch = *format++;
+				if (ch == 'l') {	/* It's a long long. */
+					ch = *format++;
+					cflags = PRINT_C_LLONG;
+				} else
+					cflags = PRINT_C_LONG;
+				break;
+			case 'L':
+				cflags = PRINT_C_LDOUBLE;
+				ch = *format++;
+				break;
+			case 'j':
+				cflags = PRINT_C_INTMAX;
+				ch = *format++;
+				break;
+			case 't':
+				cflags = PRINT_C_PTRDIFF;
+				ch = *format++;
+				break;
+			case 'z':
+				cflags = PRINT_C_SIZE;
+				ch = *format++;
+				break;
+			}
+			state = PRINT_S_CONV;
+			break;
+		case PRINT_S_CONV:
+			switch (ch) {
+			case 'd':
+				/* FALLTHROUGH */
+			case 'i':
+				switch (cflags) {
+				case PRINT_C_CHAR:
+					value = (signed char)va_arg(args, int);
+					break;
+				case PRINT_C_SHORT:
+					value = (short int)va_arg(args, int);
+					break;
+				case PRINT_C_LONG:
+					value = va_arg(args, long int);
+					break;
+				case PRINT_C_LLONG:
+					value = va_arg(args, LLONG);
+					break;
+				case PRINT_C_SIZE:
+					value = va_arg(args, SSIZE_T);
+					break;
+				case PRINT_C_INTMAX:
+					value = va_arg(args, INTMAX_T);
+					break;
+				case PRINT_C_PTRDIFF:
+					value = va_arg(args, PTRDIFF_T);
+					break;
+				default:
+					value = va_arg(args, int);
+					break;
+				}
+				fmtint(str, &len, size, value, 10, width,
+				    precision, flags);
+				break;
+			case 'X':
+				flags |= PRINT_F_UP;
+				/* FALLTHROUGH */
+			case 'x':
+				base = 16;
+				/* FALLTHROUGH */
+			case 'o':
+				if (base == 0)
+					base = 8;
+				/* FALLTHROUGH */
+			case 'u':
+				if (base == 0)
+					base = 10;
+				flags |= PRINT_F_UNSIGNED;
+				switch (cflags) {
+				case PRINT_C_CHAR:
+					value = (unsigned char)va_arg(args,
+					    unsigned int);
+					break;
+				case PRINT_C_SHORT:
+					value = (unsigned short int)va_arg(args,
+					    unsigned int);
+					break;
+				case PRINT_C_LONG:
+					value = va_arg(args, unsigned long int);
+					break;
+				case PRINT_C_LLONG:
+					value = va_arg(args, ULLONG);
+					break;
+				case PRINT_C_SIZE:
+					value = va_arg(args, size_t);
+					break;
+				case PRINT_C_INTMAX:
+					value = va_arg(args, UINTMAX_T);
+					break;
+				case PRINT_C_PTRDIFF:
+					value = va_arg(args, UPTRDIFF_T);
+					break;
+				default:
+					value = va_arg(args, unsigned int);
+					break;
+				}
+				fmtint(str, &len, size, value, base, width,
+				    precision, flags);
+				break;
+			case 'A':
+				/* Not yet supported, we'll use "%F". */
+				/* FALLTHROUGH */
+			case 'F':
+				flags |= PRINT_F_UP;
+			case 'a':
+				/* Not yet supported, we'll use "%f". */
+				/* FALLTHROUGH */
+			case 'f':
+				if (cflags == PRINT_C_LDOUBLE)
+					fvalue = va_arg(args, LDOUBLE);
+				else
+					fvalue = va_arg(args, double);
+				fmtflt(str, &len, size, fvalue, width,
+				    precision, flags, &overflow);
+				if (overflow)
+					goto out;
+				break;
+			case 'E':
+				flags |= PRINT_F_UP;
+				/* FALLTHROUGH */
+			case 'e':
+				flags |= PRINT_F_TYPE_E;
+				if (cflags == PRINT_C_LDOUBLE)
+					fvalue = va_arg(args, LDOUBLE);
+				else
+					fvalue = va_arg(args, double);
+				fmtflt(str, &len, size, fvalue, width,
+				    precision, flags, &overflow);
+				if (overflow)
+					goto out;
+				break;
+			case 'G':
+				flags |= PRINT_F_UP;
+				/* FALLTHROUGH */
+			case 'g':
+				flags |= PRINT_F_TYPE_G;
+				if (cflags == PRINT_C_LDOUBLE)
+					fvalue = va_arg(args, LDOUBLE);
+				else
+					fvalue = va_arg(args, double);
+				/*
+				 * If the precision is zero, it is treated as
+				 * one (cf. C99: 7.19.6.1, 8).
+				 */
+				if (precision == 0)
+					precision = 1;
+				fmtflt(str, &len, size, fvalue, width,
+				    precision, flags, &overflow);
+				if (overflow)
+					goto out;
+				break;
+			case 'c':
+				cvalue = (unsigned char)va_arg(args, int);
+				OUTCHAR(str, len, size, cvalue);
+				break;
+			case 's':
+				strvalue = va_arg(args, char *);
+				fmtstr(str, &len, size, strvalue, width,
+				    precision, flags);
+				break;
+			case 'p':
+				/*
+				 * C99 says: "The value of the pointer is
+				 * converted to a sequence of printing
+				 * characters, in an implementation-defined
+				 * manner." (C99: 7.19.6.1, 8)
+				 */
+				if ((strvalue = va_arg(args, void *)) == NULL)
+					/*
+					 * We use the glibc format.  BSD prints
+					 * "0x0", SysV "0".
+					 */
+					fmtstr(str, &len, size, "(nil)", width,
+					    -1, flags);
+				else {
+					/*
+					 * We use the BSD/glibc format.  SysV
+					 * omits the "0x" prefix (which we emit
+					 * using the PRINT_F_NUM flag).
+					 */
+					flags |= PRINT_F_NUM;
+					flags |= PRINT_F_UNSIGNED;
+					fmtint(str, &len, size,
+					    (UINTPTR_T)strvalue, 16, width,
+					    precision, flags);
+				}
+				break;
+			case 'n':
+				switch (cflags) {
+				case PRINT_C_CHAR:
+					charptr = va_arg(args, signed char *);
+					*charptr = (signed char)len;
+					break;
+				case PRINT_C_SHORT:
+					shortptr = va_arg(args, short int *);
+					*shortptr = (short int)len;
+					break;
+				case PRINT_C_LONG:
+					longptr = va_arg(args, long int *);
+					*longptr = (long int)len;
+					break;
+				case PRINT_C_LLONG:
+					llongptr = va_arg(args, LLONG *);
+					*llongptr = (LLONG)len;
+					break;
+				case PRINT_C_SIZE:
+					/*
+					 * C99 says that with the "z" length
+					 * modifier, "a following `n' conversion
+					 * specifier applies to a pointer to a
+					 * signed integer type corresponding to
+					 * size_t argument." (7.19.6.1, 7)
+					 */
+					sizeptr = va_arg(args, SSIZE_T *);
+					*sizeptr = len;
+					break;
+				case PRINT_C_INTMAX:
+					intmaxptr = va_arg(args, INTMAX_T *);
+					*intmaxptr = len;
+					break;
+				case PRINT_C_PTRDIFF:
+					ptrdiffptr = va_arg(args, PTRDIFF_T *);
+					*ptrdiffptr = len;
+					break;
+				default:
+					intptr = va_arg(args, int *);
+					*intptr = (int)len;
+					break;
+				}
+				break;
+			case '%':	/* Print a "%" character verbatim. */
+				OUTCHAR(str, len, size, ch);
+				break;
+			default:	/* Skip other characters. */
+				break;
+			}
+			ch = *format++;
+			state = PRINT_S_DEFAULT;
+			base = cflags = flags = width = 0;
+			precision = -1;
+			break;
+		}
+out:
+	if (len < size)
+		str[len] = '\0';
+	else if (size > 0)
+		str[size - 1] = '\0';
+
+	if (overflow || len >= INT_MAX) {
+		return -1;
+	}
+	return (int)len;
+}
+
+static void
+fmtstr(char *str, size_t *len, size_t size, const char *value, int width,
+       int precision, int flags)
+{
+	int padlen, strln;	/* Amount to pad. */
+	int noprecision = (precision == -1);
+
+	if (value == NULL)	/* We're forgiving. */
+		value = "(null)";
+
+	/* If a precision was specified, don't read the string past it. */
+	for (strln = 0; value[strln] != '\0' &&
+	    (noprecision || strln < precision); strln++)
+		continue;
+
+	if ((padlen = width - strln) < 0)
+		padlen = 0;
+	if (flags & PRINT_F_MINUS)	/* Left justify. */
+		padlen = -padlen;
+
+	while (padlen > 0) {	/* Leading spaces. */
+		OUTCHAR(str, *len, size, ' ');
+		padlen--;
+	}
+	while (*value != '\0' && (noprecision || precision-- > 0)) {
+		OUTCHAR(str, *len, size, *value);
+		value++;
+	}
+	while (padlen < 0) {	/* Trailing spaces. */
+		OUTCHAR(str, *len, size, ' ');
+		padlen++;
+	}
+}
+
+static void
+fmtint(char *str, size_t *len, size_t size, INTMAX_T value, int base, int width,
+       int precision, int flags)
+{
+	UINTMAX_T uvalue;
+	char iconvert[MAX_CONVERT_LENGTH];
+	char sign = 0;
+	char hexprefix = 0;
+	int spadlen = 0;	/* Amount to space pad. */
+	int zpadlen = 0;	/* Amount to zero pad. */
+	int pos;
+	int separators = (flags & PRINT_F_QUOTE);
+	int noprecision = (precision == -1);
+
+	if (flags & PRINT_F_UNSIGNED)
+		uvalue = value;
+	else {
+		uvalue = (value >= 0) ? value : -value;
+		if (value < 0)
+			sign = '-';
+		else if (flags & PRINT_F_PLUS)	/* Do a sign. */
+			sign = '+';
+		else if (flags & PRINT_F_SPACE)
+			sign = ' ';
+	}
+
+	pos = convert(uvalue, iconvert, sizeof(iconvert), base,
+	    flags & PRINT_F_UP);
+
+	if (flags & PRINT_F_NUM && uvalue != 0) {
+		/*
+		 * C99 says: "The result is converted to an `alternative form'.
+		 * For `o' conversion, it increases the precision, if and only
+		 * if necessary, to force the first digit of the result to be a
+		 * zero (if the value and precision are both 0, a single 0 is
+		 * printed).  For `x' (or `X') conversion, a nonzero result has
+		 * `0x' (or `0X') prefixed to it." (7.19.6.1, 6)
+		 */
+		switch (base) {
+		case 8:
+			if (precision <= pos)
+				precision = pos + 1;
+			break;
+		case 16:
+			hexprefix = (flags & PRINT_F_UP) ? 'X' : 'x';
+			break;
+		}
+	}
+
+	if (separators)	/* Get the number of group separators we'll print. */
+		separators = getnumsep(pos);
+
+	zpadlen = precision - pos - separators;
+	spadlen = width                         /* Minimum field width. */
+	    - separators                        /* Number of separators. */
+	    - MAX(precision, pos)               /* Number of integer digits. */
+	    - ((sign != 0) ? 1 : 0)             /* Will we print a sign? */
+	    - ((hexprefix != 0) ? 2 : 0);       /* Will we print a prefix? */
+
+	if (zpadlen < 0)
+		zpadlen = 0;
+	if (spadlen < 0)
+		spadlen = 0;
+
+	/*
+	 * C99 says: "If the `0' and `-' flags both appear, the `0' flag is
+	 * ignored.  For `d', `i', `o', `u', `x', and `X' conversions, if a
+	 * precision is specified, the `0' flag is ignored." (7.19.6.1, 6)
+	 */
+	if (flags & PRINT_F_MINUS)	/* Left justify. */
+		spadlen = -spadlen;
+	else if (flags & PRINT_F_ZERO && noprecision) {
+		zpadlen += spadlen;
+		spadlen = 0;
+	}
+	while (spadlen > 0) {	/* Leading spaces. */
+		OUTCHAR(str, *len, size, ' ');
+		spadlen--;
+	}
+	if (sign != 0)	/* Sign. */
+		OUTCHAR(str, *len, size, sign);
+	if (hexprefix != 0) {	/* A "0x" or "0X" prefix. */
+		OUTCHAR(str, *len, size, '0');
+		OUTCHAR(str, *len, size, hexprefix);
+	}
+	while (zpadlen > 0) {	/* Leading zeros. */
+		OUTCHAR(str, *len, size, '0');
+		zpadlen--;
+	}
+	while (pos > 0) {	/* The actual digits. */
+		pos--;
+		OUTCHAR(str, *len, size, iconvert[pos]);
+		if (separators > 0 && pos > 0 && pos % 3 == 0)
+			printsep(str, len, size);
+	}
+	while (spadlen < 0) {	/* Trailing spaces. */
+		OUTCHAR(str, *len, size, ' ');
+		spadlen++;
+	}
+}
+
+static void
+fmtflt(char *str, size_t *len, size_t size, LDOUBLE fvalue, int width,
+       int precision, int flags, int *overflow)
+{
+	LDOUBLE ufvalue;
+	UINTMAX_T intpart;
+	UINTMAX_T fracpart;
+	UINTMAX_T mask;
+	const char *infnan = NULL;
+	char iconvert[MAX_CONVERT_LENGTH];
+	char fconvert[MAX_CONVERT_LENGTH];
+	char econvert[4];	/* "e-12" (without nul-termination). */
+	char esign = 0;
+	char sign = 0;
+	int leadfraczeros = 0;
+	int exponent = 0;
+	int emitpoint = 0;
+	int omitzeros = 0;
+	int omitcount = 0;
+	int padlen = 0;
+	int epos = 0;
+	int fpos = 0;
+	int ipos = 0;
+	int separators = (flags & PRINT_F_QUOTE);
+	int estyle = (flags & PRINT_F_TYPE_E);
+#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT
+	struct lconv *lc = localeconv();
+#endif	/* HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT */
+
+	/*
+	 * AIX' man page says the default is 0, but C99 and at least Solaris'
+	 * and NetBSD's man pages say the default is 6, and sprintf(3) on AIX
+	 * defaults to 6.
+	 */
+	if (precision == -1)
+		precision = 6;
+
+	if (fvalue < 0.0)
+		sign = '-';
+	else if (flags & PRINT_F_PLUS)	/* Do a sign. */
+		sign = '+';
+	else if (flags & PRINT_F_SPACE)
+		sign = ' ';
+
+	if (ISNAN(fvalue))
+		infnan = (flags & PRINT_F_UP) ? "NAN" : "nan";
+	else if (ISINF(fvalue))
+		infnan = (flags & PRINT_F_UP) ? "INF" : "inf";
+
+	if (infnan != NULL) {
+		if (sign != 0)
+			iconvert[ipos++] = sign;
+		while (*infnan != '\0')
+			iconvert[ipos++] = *infnan++;
+		fmtstr(str, len, size, iconvert, width, ipos, flags);
+		return;
+	}
+
+	/* "%e" (or "%E") or "%g" (or "%G") conversion. */
+	if (flags & PRINT_F_TYPE_E || flags & PRINT_F_TYPE_G) {
+		if (flags & PRINT_F_TYPE_G) {
+			/*
+			 * For "%g" (and "%G") conversions, the precision
+			 * specifies the number of significant digits, which
+			 * includes the digits in the integer part.  The
+			 * conversion will or will not be using "e-style" (like
+			 * "%e" or "%E" conversions) depending on the precision
+			 * and on the exponent.  However, the exponent can be
+			 * affected by rounding the converted value, so we'll
+			 * leave this decision for later.  Until then, we'll
+			 * assume that we're going to do an "e-style" conversion
+			 * (in order to get the exponent calculated).  For
+			 * "e-style", the precision must be decremented by one.
+			 */
+			precision--;
+			/*
+			 * For "%g" (and "%G") conversions, trailing zeros are
+			 * removed from the fractional portion of the result
+			 * unless the "#" flag was specified.
+			 */
+			if (!(flags & PRINT_F_NUM))
+				omitzeros = 1;
+		}
+		exponent = getexponent(fvalue);
+		estyle = 1;
+	}
+
+again:
+	/*
+	 * Sorry, we only support 9, 19, or 38 digits (that is, the number of
+	 * digits of the 32-bit, the 64-bit, or the 128-bit UINTMAX_MAX value
+	 * minus one) past the decimal point due to our conversion method.
+	 */
+	switch (sizeof(UINTMAX_T)) {
+	case 16:
+		if (precision > 38)
+			precision = 38;
+		break;
+	case 8:
+		if (precision > 19)
+			precision = 19;
+		break;
+	default:
+		if (precision > 9)
+			precision = 9;
+		break;
+	}
+
+	ufvalue = (fvalue >= 0.0) ? fvalue : -fvalue;
+	if (estyle)	/* We want exactly one integer digit. */
+		ufvalue /= mypow10(exponent);
+
+	if ((intpart = cast(ufvalue)) == UINTMAX_MAX) {
+		*overflow = 1;
+		return;
+	}
+
+	/*
+	 * Factor of ten with the number of digits needed for the fractional
+	 * part.  For example, if the precision is 3, the mask will be 1000.
+	 */
+	mask = (UINTMAX_T)mypow10(precision);
+	/*
+	 * We "cheat" by converting the fractional part to integer by
+	 * multiplying by a factor of ten.
+	 */
+	if ((fracpart = myround(mask * (ufvalue - intpart))) >= mask) {
+		/*
+		 * For example, ufvalue = 2.99962, intpart = 2, and mask = 1000
+		 * (because precision = 3).  Now, myround(1000 * 0.99962) will
+		 * return 1000.  So, the integer part must be incremented by one
+		 * and the fractional part must be set to zero.
+		 */
+		intpart++;
+		fracpart = 0;
+		if (estyle && intpart == 10) {
+			/*
+			 * The value was rounded up to ten, but we only want one
+			 * integer digit if using "e-style".  So, the integer
+			 * part must be set to one and the exponent must be
+			 * incremented by one.
+			 */
+			intpart = 1;
+			exponent++;
+		}
+	}
+
+	/*
+	 * Now that we know the real exponent, we can check whether or not to
+	 * use "e-style" for "%g" (and "%G") conversions.  If we don't need
+	 * "e-style", the precision must be adjusted and the integer and
+	 * fractional parts must be recalculated from the original value.
+	 *
+	 * C99 says: "Let P equal the precision if nonzero, 6 if the precision
+	 * is omitted, or 1 if the precision is zero.  Then, if a conversion
+	 * with style `E' would have an exponent of X:
+	 *
+	 * - if P > X >= -4, the conversion is with style `f' (or `F') and
+	 *   precision P - (X + 1).
+	 *
+	 * - otherwise, the conversion is with style `e' (or `E') and precision
+	 *   P - 1." (7.19.6.1, 8)
+	 *
+	 * Note that we had decremented the precision by one.
+	 */
+	if (flags & PRINT_F_TYPE_G && estyle &&
+	    precision + 1 > exponent && exponent >= -4) {
+		precision -= exponent;
+		estyle = 0;
+		goto again;
+	}
+
+	if (estyle) {
+		if (exponent < 0) {
+			exponent = -exponent;
+			esign = '-';
+		} else
+			esign = '+';
+
+		/*
+		 * Convert the exponent.  The sizeof(econvert) is 4.  So, the
+		 * econvert buffer can hold e.g. "e+99" and "e-99".  We don't
+		 * support an exponent which contains more than two digits.
+		 * Therefore, the following stores are safe.
+		 */
+		epos = convert(exponent, econvert, 2, 10, 0);
+		/*
+		 * C99 says: "The exponent always contains at least two digits,
+		 * and only as many more digits as necessary to represent the
+		 * exponent." (7.19.6.1, 8)
+		 */
+		if (epos == 1)
+			econvert[epos++] = '0';
+		econvert[epos++] = esign;
+		econvert[epos++] = (flags & PRINT_F_UP) ? 'E' : 'e';
+	}
+
+	/* Convert the integer part and the fractional part. */
+	ipos = convert(intpart, iconvert, sizeof(iconvert), 10, 0);
+	if (fracpart != 0)	/* convert() would return 1 if fracpart == 0. */
+		fpos = convert(fracpart, fconvert, sizeof(fconvert), 10, 0);
+
+	leadfraczeros = precision - fpos;
+
+	if (omitzeros) {
+		if (fpos > 0)	/* Omit trailing fractional part zeros. */
+			while (omitcount < fpos && fconvert[omitcount] == '0')
+				omitcount++;
+		else {	/* The fractional part is zero, omit it completely. */
+			omitcount = precision;
+			leadfraczeros = 0;
+		}
+		precision -= omitcount;
+	}
+
+	/*
+	 * Print a decimal point if either the fractional part is non-zero
+	 * and/or the "#" flag was specified.
+	 */
+	if (precision > 0 || flags & PRINT_F_NUM)
+		emitpoint = 1;
+	if (separators)	/* Get the number of group separators we'll print. */
+		separators = getnumsep(ipos);
+
+	padlen = width                  /* Minimum field width. */
+	    - ipos                      /* Number of integer digits. */
+	    - epos                      /* Number of exponent characters. */
+	    - precision                 /* Number of fractional digits. */
+	    - separators                /* Number of group separators. */
+	    - (emitpoint ? 1 : 0)       /* Will we print a decimal point? */
+	    - ((sign != 0) ? 1 : 0);    /* Will we print a sign character? */
+
+	if (padlen < 0)
+		padlen = 0;
+
+	/*
+	 * C99 says: "If the `0' and `-' flags both appear, the `0' flag is
+	 * ignored." (7.19.6.1, 6)
+	 */
+	if (flags & PRINT_F_MINUS)	/* Left justifty. */
+		padlen = -padlen;
+	else if (flags & PRINT_F_ZERO && padlen > 0) {
+		if (sign != 0) {	/* Sign. */
+			OUTCHAR(str, *len, size, sign);
+			sign = 0;
+		}
+		while (padlen > 0) {	/* Leading zeros. */
+			OUTCHAR(str, *len, size, '0');
+			padlen--;
+		}
+	}
+	while (padlen > 0) {	/* Leading spaces. */
+		OUTCHAR(str, *len, size, ' ');
+		padlen--;
+	}
+	if (sign != 0)	/* Sign. */
+		OUTCHAR(str, *len, size, sign);
+	while (ipos > 0) {	/* Integer part. */
+		ipos--;
+		OUTCHAR(str, *len, size, iconvert[ipos]);
+		if (separators > 0 && ipos > 0 && ipos % 3 == 0)
+			printsep(str, len, size);
+	}
+	if (emitpoint) {	/* Decimal point. */
+#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT
+		if (lc->decimal_point != NULL && *lc->decimal_point != '\0')
+			OUTCHAR(str, *len, size, *lc->decimal_point);
+		else	/* We'll always print some decimal point character. */
+#endif	/* HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT */
+			OUTCHAR(str, *len, size, '.');
+	}
+	while (leadfraczeros > 0) {	/* Leading fractional part zeros. */
+		OUTCHAR(str, *len, size, '0');
+		leadfraczeros--;
+	}
+	while (fpos > omitcount) {	/* The remaining fractional part. */
+		fpos--;
+		OUTCHAR(str, *len, size, fconvert[fpos]);
+	}
+	while (epos > 0) {	/* Exponent. */
+		epos--;
+		OUTCHAR(str, *len, size, econvert[epos]);
+	}
+	while (padlen < 0) {	/* Trailing spaces. */
+		OUTCHAR(str, *len, size, ' ');
+		padlen++;
+	}
+}
+
+static void
+printsep(char *str, size_t *len, size_t size)
+{
+#if HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP
+	struct lconv *lc = localeconv();
+	int i;
+
+	if (lc->thousands_sep != NULL)
+		for (i = 0; lc->thousands_sep[i] != '\0'; i++)
+			OUTCHAR(str, *len, size, lc->thousands_sep[i]);
+	else
+#endif	/* HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP */
+		OUTCHAR(str, *len, size, ',');
+}
+
+static int
+getnumsep(int digits)
+{
+	int separators = (digits - ((digits % 3 == 0) ? 1 : 0)) / 3;
+#if HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP
+	int strln;
+	struct lconv *lc = localeconv();
+
+	/* We support an arbitrary separator length (including zero). */
+	if (lc->thousands_sep != NULL) {
+		for (strln = 0; lc->thousands_sep[strln] != '\0'; strln++)
+			continue;
+		separators *= strln;
+	}
+#endif	/* HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP */
+	return separators;
+}
+
+static int
+getexponent(LDOUBLE value)
+{
+	LDOUBLE tmp = (value >= 0.0) ? value : -value;
+	int exponent = 0;
+
+	/*
+	 * We check for 99 > exponent > -99 in order to work around possible
+	 * endless loops which could happen (at least) in the second loop (at
+	 * least) if we're called with an infinite value.  However, we checked
+	 * for infinity before calling this function using our ISINF() macro, so
+	 * this might be somewhat paranoid.
+	 */
+	while (tmp < 1.0 && tmp > 0.0 && --exponent > -99)
+		tmp *= 10;
+	while (tmp >= 10.0 && ++exponent < 99)
+		tmp /= 10;
+
+	return exponent;
+}
+
+static int
+convert(UINTMAX_T value, char *buf, size_t size, int base, int caps)
+{
+	const char *digits = caps ? "0123456789ABCDEF" : "0123456789abcdef";
+	size_t pos = 0;
+
+	/* We return an unterminated buffer with the digits in reverse order. */
+	do {
+		buf[pos++] = digits[value % base];
+		value /= base;
+	} while (value != 0 && pos < size);
+
+	return (int)pos;
+}
+
+static UINTMAX_T
+cast(LDOUBLE value)
+{
+	UINTMAX_T result;
+
+	/*
+	 * We check for ">=" and not for ">" because if UINTMAX_MAX cannot be
+	 * represented exactly as an LDOUBLE value (but is less than LDBL_MAX),
+	 * it may be increased to the nearest higher representable value for the
+	 * comparison (cf. C99: 6.3.1.4, 2).  It might then equal the LDOUBLE
+	 * value although converting the latter to UINTMAX_T would overflow.
+	 */
+	if (value >= UINTMAX_MAX)
+		return UINTMAX_MAX;
+
+	result = (UINTMAX_T)value;
+	/*
+	 * At least on NetBSD/sparc64 3.0.2 and 4.99.30, casting long double to
+	 * an integer type converts e.g. 1.9 to 2 instead of 1 (which violates
+	 * the standard).  Sigh.
+	 */
+	return (result <= value) ? result : result - 1;
+}
+
+static UINTMAX_T
+myround(LDOUBLE value)
+{
+	UINTMAX_T intpart = cast(value);
+
+	return ((value -= intpart) < 0.5) ? intpart : intpart + 1;
+}
+
+static LDOUBLE
+mypow10(int exponent)
+{
+	LDOUBLE result = 1;
+
+	while (exponent > 0) {
+		result *= 10;
+		exponent--;
+	}
+	while (exponent < 0) {
+		result /= 10;
+		exponent++;
+	}
+	return result;
+}
+#endif	/* !HAVE_VSNPRINTF */
+
+#if !HAVE_VASPRINTF
+#if NEED_MYMEMCPY
+void *
+mymemcpy(void *dst, void *src, size_t len)
+{
+	const char *from = src;
+	char *to = dst;
+
+	/* No need for optimization, we use this only to replace va_copy(3). */
+	while (len-- > 0)
+		*to++ = *from++;
+	return dst;
+}
+#endif	/* NEED_MYMEMCPY */
+
+int
+util_vasprintf(char **ret, const char *format, va_list ap)
+{
+	size_t size;
+	int len;
+	va_list aq;
+
+	VA_COPY(aq, ap);
+	len = vsnprintf(NULL, 0, format, aq);
+	VA_END_COPY(aq);
+	if (len < 0 || (*ret = malloc(size = len + 1)) == NULL)
+		return -1;
+	return vsnprintf(*ret, size, format, ap);
+}
+#endif	/* !HAVE_VASPRINTF */
+
+#if !HAVE_SNPRINTF
+#if HAVE_STDARG_H
+int
+util_snprintf(char *str, size_t size, const char *format, ...)
+#else
+int
+util_snprintf(va_alist) va_dcl
+#endif	/* HAVE_STDARG_H */
+{
+#if !HAVE_STDARG_H
+	char *str;
+	size_t size;
+	char *format;
+#endif	/* HAVE_STDARG_H */
+	va_list ap;
+	int len;
+
+	VA_START(ap, format);
+	VA_SHIFT(ap, str, char *);
+	VA_SHIFT(ap, size, size_t);
+	VA_SHIFT(ap, format, const char *);
+	len = vsnprintf(str, size, format, ap);
+	va_end(ap);
+	return len;
+}
+#endif	/* !HAVE_SNPRINTF */
+
+#if !HAVE_ASPRINTF
+#if HAVE_STDARG_H
+int
+util_asprintf(char **ret, const char *format, ...)
+#else
+int
+util_asprintf(va_alist) va_dcl
+#endif	/* HAVE_STDARG_H */
+{
+#if !HAVE_STDARG_H
+	char **ret;
+	char *format;
+#endif	/* HAVE_STDARG_H */
+	va_list ap;
+	int len;
+
+	VA_START(ap, format);
+	VA_SHIFT(ap, ret, char **);
+	VA_SHIFT(ap, format, const char *);
+	len = vasprintf(ret, format, ap);
+	va_end(ap);
+	return len;
+}
+#endif	/* !HAVE_ASPRINTF */
+#else	/* Dummy declaration to avoid empty translation unit warnings. */
+int main(void);
+#endif	/* !HAVE_SNPRINTF || !HAVE_VSNPRINTF || !HAVE_ASPRINTF || [...] */
+
+
+/* vim: set joinspaces textwidth=80: */
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf.c b/mesalib/src/gallium/auxiliary/util/u_vbuf.c
index f6da91203..5b0e26e30 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf.c
@@ -808,6 +808,8 @@ static void u_vbuf_get_minmax_index(struct pipe_context *pipe,
    }
    default:
       assert(0);
+      *out_min_index = 0;
+      *out_max_index = 0;
    }
 
    if (transfer) {
diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index a3520120f..20a0377d4 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -585,6 +585,7 @@ dump_ir:
    printf("callee:\n");
    callee->print();
    abort();
+   return visit_stop;
 }
 
 void
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index fdd657900..dad7d5972 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -4,83 +4,81 @@
 
 Import('*')
 
-if env['platform'] != 'winddk':
+env = env.Clone()
 
-    env = env.Clone()
-    
+env.Append(CPPDEFINES = [
+    'MAPI_MODE_UTIL',
+])
+
+if env['platform'] == 'windows':
     env.Append(CPPDEFINES = [
-        'MAPI_MODE_UTIL',
+        '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
     ])
+    if env['gles']:
+        env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
+    else:
+        # prevent _glapi_* from being declared __declspec(dllimport)
+        env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
+
+env.Append(CPPPATH = [
+    '#/src/mapi',
+    '#/src/mesa',
+])
+
+glapi_sources = [
+    'glapi_dispatch.c',
+    'glapi_entrypoint.c',
+    'glapi_getproc.c',
+    'glapi_nop.c',
+    'glthread.c',
+    'glapi.c',
+]
 
-    if env['platform'] == 'windows':
+mapi_sources = [
+    'u_current.c',
+    'u_execmem.c',
+    'u_thread.c',
+]
+for s in mapi_sources:
+    o = env.SharedObject(s[:-2], '../mapi/' + s)
+    glapi_sources.append(o)
+
+#
+# Assembly sources
+#
+if env['gcc'] and env['platform'] != 'windows':
+    if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
-            '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
-            'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+            'USE_X86_ASM',
         ])
-        if env['gles']:
-            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
-        else:
-            # prevent _glapi_* from being declared __declspec(dllimport)
-            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-
-    env.Append(CPPPATH = [
-        '#/src/mapi',
-        '#/src/mesa',
-    ])
-    
-    glapi_sources = [
-        'glapi_dispatch.c',
-        'glapi_entrypoint.c',
-        'glapi_getproc.c',
-        'glapi_nop.c',
-        'glthread.c',
-        'glapi.c',
-    ]
-    
-    mapi_sources = [
-        'u_current.c',
-        'u_execmem.c',
-        'u_thread.c',
-    ]
-    for s in mapi_sources:
-        o = env.SharedObject(s[:-2], '../mapi/' + s)
-        glapi_sources.append(o)
+        glapi_sources += [
+            'glapi_x86.S',
+        ]
+    elif env['machine'] == 'x86_64':
+        env.Append(CPPDEFINES = [
+            'USE_X86_64_ASM',
+        ])
+        glapi_sources += [
+            'glapi_x86-64.S'
+        ]
+    elif env['machine'] == 'sparc':
+        env.Append(CPPDEFINES = [
+            'USE_SPARC_ASM',
+        ])
+        glapi_sources += [
+            'glapi_sparc.S'
+        ]
+    else:
+        pass
 
-    #
-    # Assembly sources
-    #
-    if env['gcc'] and env['platform'] != 'windows':
-        if env['machine'] == 'x86':
-            env.Append(CPPDEFINES = [
-                'USE_X86_ASM',
-            ])
-            glapi_sources += [
-                'glapi_x86.S',
-            ]
-        elif env['machine'] == 'x86_64':
-            env.Append(CPPDEFINES = [
-                'USE_X86_64_ASM',
-            ])
-            glapi_sources += [
-                'glapi_x86-64.S'
-            ]
-        elif env['machine'] == 'sparc':
-            env.Append(CPPDEFINES = [
-                'USE_SPARC_ASM',
-            ])
-            glapi_sources += [
-                'glapi_sparc.S'
-            ]
-        else:
-            pass
-    
-    if env['toolchain'] == 'crossmingw':
-        # compile these files without -gstabs option
-        glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_dispatch.c")
-        glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_getproc.c")
+if env['toolchain'] == 'crossmingw':
+    # compile these files without -gstabs option
+    glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_dispatch.c")
+    glapi_sources = env.compile_without_gstabs(glapi_sources, "glapi_getproc.c")
 
-    glapi = env.ConvenienceLibrary(
-        target = 'glapi',
-        source = glapi_sources,
-    )
-    Export('glapi')
+glapi = env.ConvenienceLibrary(
+    target = 'glapi',
+    source = glapi_sources,
+)
+Export('glapi')
diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml
index bc98aee3d..c7e7d07e3 100644
--- a/mesalib/src/mapi/glapi/gen/es_EXT.xml
+++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml
@@ -48,6 +48,10 @@
     <enum name="BYTE"                                     value="0x1400"/>
 </category>
 
+<category name="GL_OES_compressed_ETC1_RGB8_texture" number="5">
+    <enum name="ETC1_RGB8_OES"                            value="0x8D64"/>
+</category>
+
 <category name="GL_OES_compressed_paletted_texture" number="6">
     <enum name="PALETTE4_RGB8_OES"                        value="0x8B90"/>
     <enum name="PALETTE4_RGBA8_OES"                       value="0x8B91"/>
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index 2cbbd971a..f6182b60b 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -179,11 +179,11 @@ class PrintRemapTable(gl_XML.gl_print_base):
 			print 'typedef %s (GLAPIENTRYP _glptr_%s)(%s);' % (f.return_type, f.name, arg_string)
 			print '#define CALL_%s(disp, parameters) \\' % (f.name)
 			print '    (* GET_%s(disp)) parameters' % (f.name)
-			print 'static INLINE _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
+			print 'static inline _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
 			print '   return (_glptr_%s) (GET_by_offset(disp, _gloffset_%s));' % (f.name, f.name)
 			print '}'
 			print
-			print 'static INLINE void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
+			print 'static inline void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
 			print '   SET_by_offset(disp, _gloffset_%s, fn);' % (f.name)
 			print '}'
 			print
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 807608636..bcb6a2491 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -116,6 +116,7 @@ main_sources = [
     'main/texcompress_rgtc.c',
     'main/texcompress_s3tc.c',
     'main/texcompress_fxt1.c',
+    'main/texcompress_etc.c',
     'main/texenv.c',
     'main/texformat.c',
     'main/texgen.c',
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index bc115e8cf..629760441 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -419,8 +419,8 @@ swrast_map_renderbuffer(struct gl_context *ctx,
       stride = -stride;
    }
 
-   map += y * stride;
-   map += x * cpp;
+   map += (GLsizei)y * stride;
+   map += (GLsizei)x * cpp;
 
    *out_map = map;
    *out_stride = stride;
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
index 99c726c83..eeae59929 100644
--- a/mesalib/src/mesa/main/APIspec.xml
+++ b/mesalib/src/mesa/main/APIspec.xml
@@ -3806,6 +3806,7 @@
 	<category name="OES_matrix_get"/>
 	<category name="OES_read_format"/>
 	<category name="OES_compressed_paletted_texture"/>
+	<category name="OES_compressed_ETC1_RGB8_texture"/>
 	<category name="OES_point_size_array"/>
 	<category name="OES_point_sprite"/>
 	<category name="OES_query_matrix"/>
@@ -4105,6 +4106,7 @@
 	<category name="GLES2.0"/>
 
 	<category name="OES_compressed_paletted_texture"/>
+	<category name="OES_compressed_ETC1_RGB8_texture"/>
 	<category name="OES_depth24"/>
 	<category name="OES_depth32"/>
 	<category name="OES_fbo_render_mipmap"/>
diff --git a/mesalib/src/mesa/main/bitset.h b/mesalib/src/mesa/main/bitset.h
index 7a0704b14..c27b4c474 100644
--- a/mesalib/src/mesa/main/bitset.h
+++ b/mesalib/src/mesa/main/bitset.h
@@ -129,17 +129,32 @@ __bitset_ffs(const BITSET_WORD *x, int n)
 
 /* bit range operations
  */
-#define BITSET64_TEST_RANGE(x, b, e) \
+#define BITSET64_TEST_SUBRANGE(x, b, e) \
    (BITSET64_BITWORD(b) == BITSET64_BITWORD(e) ? \
    ((x)[BITSET64_BITWORD(b)] & BITSET64_RANGE(b, e)) : \
    (assert (!"BITSET64_TEST_RANGE: bit range crosses word boundary"), 0))
-#define BITSET64_SET_RANGE(x, b, e) \
+#define BITSET64_TEST_RANGE(x, b, e) \
+   (BITSET64_BITWORD(b) == BITSET64_BITWORD(e) ? \
+   (BITSET64_TEST_SUBRANGE(x, b, e)) : \
+   (BITSET64_TEST_SUBRANGE(x, b, BITSET64_WORDBITS - 1) | \
+    BITSET64_TEST_SUBRANGE(x, BITSET64_WORDBITS, e)))
+#define BITSET64_SET_SUBRANGE(x, b, e) \
    (BITSET64_BITWORD(b) == BITSET64_BITWORD(e) ? \
    ((x)[BITSET64_BITWORD(b)] |= BITSET64_RANGE(b, e)) : \
    (assert (!"BITSET64_SET_RANGE: bit range crosses word boundary"), 0))
-#define BITSET64_CLEAR_RANGE(x, b, e) \
+#define BITSET64_SET_RANGE(x, b, e) \
+   (BITSET64_BITWORD(b) == BITSET64_BITWORD(e) ? \
+   (BITSET64_SET_SUBRANGE(x, b, e)) : \
+   (BITSET64_SET_SUBRANGE(x, b, BITSET64_WORDBITS - 1) | \
+    BITSET64_SET_SUBRANGE(x, BITSET64_WORDBITS, e)))
+#define BITSET64_CLEAR_SUBRANGE(x, b, e) \
    (BITSET64_BITWORD(b) == BITSET64_BITWORD(e) ? \
    ((x)[BITSET64_BITWORD(b)] &= ~BITSET64_RANGE(b, e)) : \
    (assert (!"BITSET64_CLEAR_RANGE: bit range crosses word boundary"), 0))
+#define BITSET64_CLEAR_RANGE(x, b, e) \
+   (BITSET64_BITWORD(b) == BITSET64_BITWORD(e) ? \
+   (BITSET64_CLEAR_SUBRANGE(x, b, e)) : \
+   (BITSET64_CLEAR_SUBRANGE(x, b, BITSET64_WORDBITS - 1) | \
+    BITSET64_CLEAR_SUBRANGE(x, BITSET64_WORDBITS, e)))
 
 #endif
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index 921e30222..25d981053 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -310,6 +310,18 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
 #endif
 #endif
 
+
+/**
+ * Static (compile-time) assertion.
+ * Basically, use COND to dimension an array.  If COND is false/zero the
+ * array size will be -1 and we'll get a compilation error.
+ */
+#define STATIC_ASSERT(COND) \
+   do { \
+      typedef int static_assertion_failed[(!!(COND))*2-1]; \
+   } while (0)
+
+
 #if (__GNUC__ >= 3)
 #define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
 #else
diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index 4e21b2d6e..ea8e03286 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -2180,10703 +2180,10703 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 typedef void (GLAPIENTRYP _glptr_NewList)(GLuint, GLenum);
 #define CALL_NewList(disp, parameters) \
     (* GET_NewList(disp)) parameters
-static INLINE _glptr_NewList GET_NewList(struct _glapi_table *disp) {
+static inline _glptr_NewList GET_NewList(struct _glapi_table *disp) {
    return (_glptr_NewList) (GET_by_offset(disp, _gloffset_NewList));
 }
 
-static INLINE void SET_NewList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
+static inline void SET_NewList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_NewList, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EndList)(void);
 #define CALL_EndList(disp, parameters) \
     (* GET_EndList(disp)) parameters
-static INLINE _glptr_EndList GET_EndList(struct _glapi_table *disp) {
+static inline _glptr_EndList GET_EndList(struct _glapi_table *disp) {
    return (_glptr_EndList) (GET_by_offset(disp, _gloffset_EndList));
 }
 
-static INLINE void SET_EndList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_EndList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_EndList, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CallList)(GLuint);
 #define CALL_CallList(disp, parameters) \
     (* GET_CallList(disp)) parameters
-static INLINE _glptr_CallList GET_CallList(struct _glapi_table *disp) {
+static inline _glptr_CallList GET_CallList(struct _glapi_table *disp) {
    return (_glptr_CallList) (GET_by_offset(disp, _gloffset_CallList));
 }
 
-static INLINE void SET_CallList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_CallList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_CallList, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CallLists)(GLsizei, GLenum, const GLvoid *);
 #define CALL_CallLists(disp, parameters) \
     (* GET_CallLists(disp)) parameters
-static INLINE _glptr_CallLists GET_CallLists(struct _glapi_table *disp) {
+static inline _glptr_CallLists GET_CallLists(struct _glapi_table *disp) {
    return (_glptr_CallLists) (GET_by_offset(disp, _gloffset_CallLists));
 }
 
-static INLINE void SET_CallLists(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLenum, const GLvoid *)) {
+static inline void SET_CallLists(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CallLists, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteLists)(GLuint, GLsizei);
 #define CALL_DeleteLists(disp, parameters) \
     (* GET_DeleteLists(disp)) parameters
-static INLINE _glptr_DeleteLists GET_DeleteLists(struct _glapi_table *disp) {
+static inline _glptr_DeleteLists GET_DeleteLists(struct _glapi_table *disp) {
    return (_glptr_DeleteLists) (GET_by_offset(disp, _gloffset_DeleteLists));
 }
 
-static INLINE void SET_DeleteLists(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei)) {
+static inline void SET_DeleteLists(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei)) {
    SET_by_offset(disp, _gloffset_DeleteLists, fn);
 }
 
 typedef GLuint (GLAPIENTRYP _glptr_GenLists)(GLsizei);
 #define CALL_GenLists(disp, parameters) \
     (* GET_GenLists(disp)) parameters
-static INLINE _glptr_GenLists GET_GenLists(struct _glapi_table *disp) {
+static inline _glptr_GenLists GET_GenLists(struct _glapi_table *disp) {
    return (_glptr_GenLists) (GET_by_offset(disp, _gloffset_GenLists));
 }
 
-static INLINE void SET_GenLists(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLsizei)) {
+static inline void SET_GenLists(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLsizei)) {
    SET_by_offset(disp, _gloffset_GenLists, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ListBase)(GLuint);
 #define CALL_ListBase(disp, parameters) \
     (* GET_ListBase(disp)) parameters
-static INLINE _glptr_ListBase GET_ListBase(struct _glapi_table *disp) {
+static inline _glptr_ListBase GET_ListBase(struct _glapi_table *disp) {
    return (_glptr_ListBase) (GET_by_offset(disp, _gloffset_ListBase));
 }
 
-static INLINE void SET_ListBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_ListBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_ListBase, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Begin)(GLenum);
 #define CALL_Begin(disp, parameters) \
     (* GET_Begin(disp)) parameters
-static INLINE _glptr_Begin GET_Begin(struct _glapi_table *disp) {
+static inline _glptr_Begin GET_Begin(struct _glapi_table *disp) {
    return (_glptr_Begin) (GET_by_offset(disp, _gloffset_Begin));
 }
 
-static INLINE void SET_Begin(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_Begin(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_Begin, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Bitmap)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *);
 #define CALL_Bitmap(disp, parameters) \
     (* GET_Bitmap(disp)) parameters
-static INLINE _glptr_Bitmap GET_Bitmap(struct _glapi_table *disp) {
+static inline _glptr_Bitmap GET_Bitmap(struct _glapi_table *disp) {
    return (_glptr_Bitmap) (GET_by_offset(disp, _gloffset_Bitmap));
 }
 
-static INLINE void SET_Bitmap(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *)) {
+static inline void SET_Bitmap(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_Bitmap, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3b)(GLbyte, GLbyte, GLbyte);
 #define CALL_Color3b(disp, parameters) \
     (* GET_Color3b(disp)) parameters
-static INLINE _glptr_Color3b GET_Color3b(struct _glapi_table *disp) {
+static inline _glptr_Color3b GET_Color3b(struct _glapi_table *disp) {
    return (_glptr_Color3b) (GET_by_offset(disp, _gloffset_Color3b));
 }
 
-static INLINE void SET_Color3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
+static inline void SET_Color3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
    SET_by_offset(disp, _gloffset_Color3b, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3bv)(const GLbyte *);
 #define CALL_Color3bv(disp, parameters) \
     (* GET_Color3bv(disp)) parameters
-static INLINE _glptr_Color3bv GET_Color3bv(struct _glapi_table *disp) {
+static inline _glptr_Color3bv GET_Color3bv(struct _glapi_table *disp) {
    return (_glptr_Color3bv) (GET_by_offset(disp, _gloffset_Color3bv));
 }
 
-static INLINE void SET_Color3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
+static inline void SET_Color3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
    SET_by_offset(disp, _gloffset_Color3bv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_Color3d(disp, parameters) \
     (* GET_Color3d(disp)) parameters
-static INLINE _glptr_Color3d GET_Color3d(struct _glapi_table *disp) {
+static inline _glptr_Color3d GET_Color3d(struct _glapi_table *disp) {
    return (_glptr_Color3d) (GET_by_offset(disp, _gloffset_Color3d));
 }
 
-static INLINE void SET_Color3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Color3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Color3d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3dv)(const GLdouble *);
 #define CALL_Color3dv(disp, parameters) \
     (* GET_Color3dv(disp)) parameters
-static INLINE _glptr_Color3dv GET_Color3dv(struct _glapi_table *disp) {
+static inline _glptr_Color3dv GET_Color3dv(struct _glapi_table *disp) {
    return (_glptr_Color3dv) (GET_by_offset(disp, _gloffset_Color3dv));
 }
 
-static INLINE void SET_Color3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Color3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Color3dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_Color3f(disp, parameters) \
     (* GET_Color3f(disp)) parameters
-static INLINE _glptr_Color3f GET_Color3f(struct _glapi_table *disp) {
+static inline _glptr_Color3f GET_Color3f(struct _glapi_table *disp) {
    return (_glptr_Color3f) (GET_by_offset(disp, _gloffset_Color3f));
 }
 
-static INLINE void SET_Color3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Color3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Color3f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3fv)(const GLfloat *);
 #define CALL_Color3fv(disp, parameters) \
     (* GET_Color3fv(disp)) parameters
-static INLINE _glptr_Color3fv GET_Color3fv(struct _glapi_table *disp) {
+static inline _glptr_Color3fv GET_Color3fv(struct _glapi_table *disp) {
    return (_glptr_Color3fv) (GET_by_offset(disp, _gloffset_Color3fv));
 }
 
-static INLINE void SET_Color3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Color3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Color3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3i)(GLint, GLint, GLint);
 #define CALL_Color3i(disp, parameters) \
     (* GET_Color3i(disp)) parameters
-static INLINE _glptr_Color3i GET_Color3i(struct _glapi_table *disp) {
+static inline _glptr_Color3i GET_Color3i(struct _glapi_table *disp) {
    return (_glptr_Color3i) (GET_by_offset(disp, _gloffset_Color3i));
 }
 
-static INLINE void SET_Color3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_Color3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Color3i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3iv)(const GLint *);
 #define CALL_Color3iv(disp, parameters) \
     (* GET_Color3iv(disp)) parameters
-static INLINE _glptr_Color3iv GET_Color3iv(struct _glapi_table *disp) {
+static inline _glptr_Color3iv GET_Color3iv(struct _glapi_table *disp) {
    return (_glptr_Color3iv) (GET_by_offset(disp, _gloffset_Color3iv));
 }
 
-static INLINE void SET_Color3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Color3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Color3iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3s)(GLshort, GLshort, GLshort);
 #define CALL_Color3s(disp, parameters) \
     (* GET_Color3s(disp)) parameters
-static INLINE _glptr_Color3s GET_Color3s(struct _glapi_table *disp) {
+static inline _glptr_Color3s GET_Color3s(struct _glapi_table *disp) {
    return (_glptr_Color3s) (GET_by_offset(disp, _gloffset_Color3s));
 }
 
-static INLINE void SET_Color3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_Color3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Color3s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3sv)(const GLshort *);
 #define CALL_Color3sv(disp, parameters) \
     (* GET_Color3sv(disp)) parameters
-static INLINE _glptr_Color3sv GET_Color3sv(struct _glapi_table *disp) {
+static inline _glptr_Color3sv GET_Color3sv(struct _glapi_table *disp) {
    return (_glptr_Color3sv) (GET_by_offset(disp, _gloffset_Color3sv));
 }
 
-static INLINE void SET_Color3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Color3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Color3sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3ub)(GLubyte, GLubyte, GLubyte);
 #define CALL_Color3ub(disp, parameters) \
     (* GET_Color3ub(disp)) parameters
-static INLINE _glptr_Color3ub GET_Color3ub(struct _glapi_table *disp) {
+static inline _glptr_Color3ub GET_Color3ub(struct _glapi_table *disp) {
    return (_glptr_Color3ub) (GET_by_offset(disp, _gloffset_Color3ub));
 }
 
-static INLINE void SET_Color3ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) {
+static inline void SET_Color3ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) {
    SET_by_offset(disp, _gloffset_Color3ub, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3ubv)(const GLubyte *);
 #define CALL_Color3ubv(disp, parameters) \
     (* GET_Color3ubv(disp)) parameters
-static INLINE _glptr_Color3ubv GET_Color3ubv(struct _glapi_table *disp) {
+static inline _glptr_Color3ubv GET_Color3ubv(struct _glapi_table *disp) {
    return (_glptr_Color3ubv) (GET_by_offset(disp, _gloffset_Color3ubv));
 }
 
-static INLINE void SET_Color3ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
+static inline void SET_Color3ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
    SET_by_offset(disp, _gloffset_Color3ubv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3ui)(GLuint, GLuint, GLuint);
 #define CALL_Color3ui(disp, parameters) \
     (* GET_Color3ui(disp)) parameters
-static INLINE _glptr_Color3ui GET_Color3ui(struct _glapi_table *disp) {
+static inline _glptr_Color3ui GET_Color3ui(struct _glapi_table *disp) {
    return (_glptr_Color3ui) (GET_by_offset(disp, _gloffset_Color3ui));
 }
 
-static INLINE void SET_Color3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+static inline void SET_Color3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_Color3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3uiv)(const GLuint *);
 #define CALL_Color3uiv(disp, parameters) \
     (* GET_Color3uiv(disp)) parameters
-static INLINE _glptr_Color3uiv GET_Color3uiv(struct _glapi_table *disp) {
+static inline _glptr_Color3uiv GET_Color3uiv(struct _glapi_table *disp) {
    return (_glptr_Color3uiv) (GET_by_offset(disp, _gloffset_Color3uiv));
 }
 
-static INLINE void SET_Color3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
+static inline void SET_Color3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
    SET_by_offset(disp, _gloffset_Color3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3us)(GLushort, GLushort, GLushort);
 #define CALL_Color3us(disp, parameters) \
     (* GET_Color3us(disp)) parameters
-static INLINE _glptr_Color3us GET_Color3us(struct _glapi_table *disp) {
+static inline _glptr_Color3us GET_Color3us(struct _glapi_table *disp) {
    return (_glptr_Color3us) (GET_by_offset(disp, _gloffset_Color3us));
 }
 
-static INLINE void SET_Color3us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) {
+static inline void SET_Color3us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) {
    SET_by_offset(disp, _gloffset_Color3us, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color3usv)(const GLushort *);
 #define CALL_Color3usv(disp, parameters) \
     (* GET_Color3usv(disp)) parameters
-static INLINE _glptr_Color3usv GET_Color3usv(struct _glapi_table *disp) {
+static inline _glptr_Color3usv GET_Color3usv(struct _glapi_table *disp) {
    return (_glptr_Color3usv) (GET_by_offset(disp, _gloffset_Color3usv));
 }
 
-static INLINE void SET_Color3usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
+static inline void SET_Color3usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
    SET_by_offset(disp, _gloffset_Color3usv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4b)(GLbyte, GLbyte, GLbyte, GLbyte);
 #define CALL_Color4b(disp, parameters) \
     (* GET_Color4b(disp)) parameters
-static INLINE _glptr_Color4b GET_Color4b(struct _glapi_table *disp) {
+static inline _glptr_Color4b GET_Color4b(struct _glapi_table *disp) {
    return (_glptr_Color4b) (GET_by_offset(disp, _gloffset_Color4b));
 }
 
-static INLINE void SET_Color4b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte, GLbyte)) {
+static inline void SET_Color4b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte, GLbyte)) {
    SET_by_offset(disp, _gloffset_Color4b, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4bv)(const GLbyte *);
 #define CALL_Color4bv(disp, parameters) \
     (* GET_Color4bv(disp)) parameters
-static INLINE _glptr_Color4bv GET_Color4bv(struct _glapi_table *disp) {
+static inline _glptr_Color4bv GET_Color4bv(struct _glapi_table *disp) {
    return (_glptr_Color4bv) (GET_by_offset(disp, _gloffset_Color4bv));
 }
 
-static INLINE void SET_Color4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
+static inline void SET_Color4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
    SET_by_offset(disp, _gloffset_Color4bv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Color4d(disp, parameters) \
     (* GET_Color4d(disp)) parameters
-static INLINE _glptr_Color4d GET_Color4d(struct _glapi_table *disp) {
+static inline _glptr_Color4d GET_Color4d(struct _glapi_table *disp) {
    return (_glptr_Color4d) (GET_by_offset(disp, _gloffset_Color4d));
 }
 
-static INLINE void SET_Color4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Color4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Color4d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4dv)(const GLdouble *);
 #define CALL_Color4dv(disp, parameters) \
     (* GET_Color4dv(disp)) parameters
-static INLINE _glptr_Color4dv GET_Color4dv(struct _glapi_table *disp) {
+static inline _glptr_Color4dv GET_Color4dv(struct _glapi_table *disp) {
    return (_glptr_Color4dv) (GET_by_offset(disp, _gloffset_Color4dv));
 }
 
-static INLINE void SET_Color4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Color4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Color4dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Color4f(disp, parameters) \
     (* GET_Color4f(disp)) parameters
-static INLINE _glptr_Color4f GET_Color4f(struct _glapi_table *disp) {
+static inline _glptr_Color4f GET_Color4f(struct _glapi_table *disp) {
    return (_glptr_Color4f) (GET_by_offset(disp, _gloffset_Color4f));
 }
 
-static INLINE void SET_Color4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Color4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Color4f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4fv)(const GLfloat *);
 #define CALL_Color4fv(disp, parameters) \
     (* GET_Color4fv(disp)) parameters
-static INLINE _glptr_Color4fv GET_Color4fv(struct _glapi_table *disp) {
+static inline _glptr_Color4fv GET_Color4fv(struct _glapi_table *disp) {
    return (_glptr_Color4fv) (GET_by_offset(disp, _gloffset_Color4fv));
 }
 
-static INLINE void SET_Color4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Color4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Color4fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4i)(GLint, GLint, GLint, GLint);
 #define CALL_Color4i(disp, parameters) \
     (* GET_Color4i(disp)) parameters
-static INLINE _glptr_Color4i GET_Color4i(struct _glapi_table *disp) {
+static inline _glptr_Color4i GET_Color4i(struct _glapi_table *disp) {
    return (_glptr_Color4i) (GET_by_offset(disp, _gloffset_Color4i));
 }
 
-static INLINE void SET_Color4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_Color4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Color4i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4iv)(const GLint *);
 #define CALL_Color4iv(disp, parameters) \
     (* GET_Color4iv(disp)) parameters
-static INLINE _glptr_Color4iv GET_Color4iv(struct _glapi_table *disp) {
+static inline _glptr_Color4iv GET_Color4iv(struct _glapi_table *disp) {
    return (_glptr_Color4iv) (GET_by_offset(disp, _gloffset_Color4iv));
 }
 
-static INLINE void SET_Color4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Color4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Color4iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_Color4s(disp, parameters) \
     (* GET_Color4s(disp)) parameters
-static INLINE _glptr_Color4s GET_Color4s(struct _glapi_table *disp) {
+static inline _glptr_Color4s GET_Color4s(struct _glapi_table *disp) {
    return (_glptr_Color4s) (GET_by_offset(disp, _gloffset_Color4s));
 }
 
-static INLINE void SET_Color4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_Color4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Color4s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4sv)(const GLshort *);
 #define CALL_Color4sv(disp, parameters) \
     (* GET_Color4sv(disp)) parameters
-static INLINE _glptr_Color4sv GET_Color4sv(struct _glapi_table *disp) {
+static inline _glptr_Color4sv GET_Color4sv(struct _glapi_table *disp) {
    return (_glptr_Color4sv) (GET_by_offset(disp, _gloffset_Color4sv));
 }
 
-static INLINE void SET_Color4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Color4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Color4sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
 #define CALL_Color4ub(disp, parameters) \
     (* GET_Color4ub(disp)) parameters
-static INLINE _glptr_Color4ub GET_Color4ub(struct _glapi_table *disp) {
+static inline _glptr_Color4ub GET_Color4ub(struct _glapi_table *disp) {
    return (_glptr_Color4ub) (GET_by_offset(disp, _gloffset_Color4ub));
 }
 
-static INLINE void SET_Color4ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte, GLubyte)) {
+static inline void SET_Color4ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte, GLubyte)) {
    SET_by_offset(disp, _gloffset_Color4ub, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4ubv)(const GLubyte *);
 #define CALL_Color4ubv(disp, parameters) \
     (* GET_Color4ubv(disp)) parameters
-static INLINE _glptr_Color4ubv GET_Color4ubv(struct _glapi_table *disp) {
+static inline _glptr_Color4ubv GET_Color4ubv(struct _glapi_table *disp) {
    return (_glptr_Color4ubv) (GET_by_offset(disp, _gloffset_Color4ubv));
 }
 
-static INLINE void SET_Color4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
+static inline void SET_Color4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
    SET_by_offset(disp, _gloffset_Color4ubv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4ui)(GLuint, GLuint, GLuint, GLuint);
 #define CALL_Color4ui(disp, parameters) \
     (* GET_Color4ui(disp)) parameters
-static INLINE _glptr_Color4ui GET_Color4ui(struct _glapi_table *disp) {
+static inline _glptr_Color4ui GET_Color4ui(struct _glapi_table *disp) {
    return (_glptr_Color4ui) (GET_by_offset(disp, _gloffset_Color4ui));
 }
 
-static INLINE void SET_Color4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_Color4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_Color4ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4uiv)(const GLuint *);
 #define CALL_Color4uiv(disp, parameters) \
     (* GET_Color4uiv(disp)) parameters
-static INLINE _glptr_Color4uiv GET_Color4uiv(struct _glapi_table *disp) {
+static inline _glptr_Color4uiv GET_Color4uiv(struct _glapi_table *disp) {
    return (_glptr_Color4uiv) (GET_by_offset(disp, _gloffset_Color4uiv));
 }
 
-static INLINE void SET_Color4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
+static inline void SET_Color4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
    SET_by_offset(disp, _gloffset_Color4uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4us)(GLushort, GLushort, GLushort, GLushort);
 #define CALL_Color4us(disp, parameters) \
     (* GET_Color4us(disp)) parameters
-static INLINE _glptr_Color4us GET_Color4us(struct _glapi_table *disp) {
+static inline _glptr_Color4us GET_Color4us(struct _glapi_table *disp) {
    return (_glptr_Color4us) (GET_by_offset(disp, _gloffset_Color4us));
 }
 
-static INLINE void SET_Color4us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort, GLushort)) {
+static inline void SET_Color4us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort, GLushort)) {
    SET_by_offset(disp, _gloffset_Color4us, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Color4usv)(const GLushort *);
 #define CALL_Color4usv(disp, parameters) \
     (* GET_Color4usv(disp)) parameters
-static INLINE _glptr_Color4usv GET_Color4usv(struct _glapi_table *disp) {
+static inline _glptr_Color4usv GET_Color4usv(struct _glapi_table *disp) {
    return (_glptr_Color4usv) (GET_by_offset(disp, _gloffset_Color4usv));
 }
 
-static INLINE void SET_Color4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
+static inline void SET_Color4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
    SET_by_offset(disp, _gloffset_Color4usv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EdgeFlag)(GLboolean);
 #define CALL_EdgeFlag(disp, parameters) \
     (* GET_EdgeFlag(disp)) parameters
-static INLINE _glptr_EdgeFlag GET_EdgeFlag(struct _glapi_table *disp) {
+static inline _glptr_EdgeFlag GET_EdgeFlag(struct _glapi_table *disp) {
    return (_glptr_EdgeFlag) (GET_by_offset(disp, _gloffset_EdgeFlag));
 }
 
-static INLINE void SET_EdgeFlag(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean)) {
+static inline void SET_EdgeFlag(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean)) {
    SET_by_offset(disp, _gloffset_EdgeFlag, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EdgeFlagv)(const GLboolean *);
 #define CALL_EdgeFlagv(disp, parameters) \
     (* GET_EdgeFlagv(disp)) parameters
-static INLINE _glptr_EdgeFlagv GET_EdgeFlagv(struct _glapi_table *disp) {
+static inline _glptr_EdgeFlagv GET_EdgeFlagv(struct _glapi_table *disp) {
    return (_glptr_EdgeFlagv) (GET_by_offset(disp, _gloffset_EdgeFlagv));
 }
 
-static INLINE void SET_EdgeFlagv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLboolean *)) {
+static inline void SET_EdgeFlagv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLboolean *)) {
    SET_by_offset(disp, _gloffset_EdgeFlagv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_End)(void);
 #define CALL_End(disp, parameters) \
     (* GET_End(disp)) parameters
-static INLINE _glptr_End GET_End(struct _glapi_table *disp) {
+static inline _glptr_End GET_End(struct _glapi_table *disp) {
    return (_glptr_End) (GET_by_offset(disp, _gloffset_End));
 }
 
-static INLINE void SET_End(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_End(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_End, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexd)(GLdouble);
 #define CALL_Indexd(disp, parameters) \
     (* GET_Indexd(disp)) parameters
-static INLINE _glptr_Indexd GET_Indexd(struct _glapi_table *disp) {
+static inline _glptr_Indexd GET_Indexd(struct _glapi_table *disp) {
    return (_glptr_Indexd) (GET_by_offset(disp, _gloffset_Indexd));
 }
 
-static INLINE void SET_Indexd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
+static inline void SET_Indexd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
    SET_by_offset(disp, _gloffset_Indexd, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexdv)(const GLdouble *);
 #define CALL_Indexdv(disp, parameters) \
     (* GET_Indexdv(disp)) parameters
-static INLINE _glptr_Indexdv GET_Indexdv(struct _glapi_table *disp) {
+static inline _glptr_Indexdv GET_Indexdv(struct _glapi_table *disp) {
    return (_glptr_Indexdv) (GET_by_offset(disp, _gloffset_Indexdv));
 }
 
-static INLINE void SET_Indexdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Indexdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Indexdv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexf)(GLfloat);
 #define CALL_Indexf(disp, parameters) \
     (* GET_Indexf(disp)) parameters
-static INLINE _glptr_Indexf GET_Indexf(struct _glapi_table *disp) {
+static inline _glptr_Indexf GET_Indexf(struct _glapi_table *disp) {
    return (_glptr_Indexf) (GET_by_offset(disp, _gloffset_Indexf));
 }
 
-static INLINE void SET_Indexf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_Indexf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_Indexf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexfv)(const GLfloat *);
 #define CALL_Indexfv(disp, parameters) \
     (* GET_Indexfv(disp)) parameters
-static INLINE _glptr_Indexfv GET_Indexfv(struct _glapi_table *disp) {
+static inline _glptr_Indexfv GET_Indexfv(struct _glapi_table *disp) {
    return (_glptr_Indexfv) (GET_by_offset(disp, _gloffset_Indexfv));
 }
 
-static INLINE void SET_Indexfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Indexfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Indexfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexi)(GLint);
 #define CALL_Indexi(disp, parameters) \
     (* GET_Indexi(disp)) parameters
-static INLINE _glptr_Indexi GET_Indexi(struct _glapi_table *disp) {
+static inline _glptr_Indexi GET_Indexi(struct _glapi_table *disp) {
    return (_glptr_Indexi) (GET_by_offset(disp, _gloffset_Indexi));
 }
 
-static INLINE void SET_Indexi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
+static inline void SET_Indexi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
    SET_by_offset(disp, _gloffset_Indexi, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexiv)(const GLint *);
 #define CALL_Indexiv(disp, parameters) \
     (* GET_Indexiv(disp)) parameters
-static INLINE _glptr_Indexiv GET_Indexiv(struct _glapi_table *disp) {
+static inline _glptr_Indexiv GET_Indexiv(struct _glapi_table *disp) {
    return (_glptr_Indexiv) (GET_by_offset(disp, _gloffset_Indexiv));
 }
 
-static INLINE void SET_Indexiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Indexiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Indexiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexs)(GLshort);
 #define CALL_Indexs(disp, parameters) \
     (* GET_Indexs(disp)) parameters
-static INLINE _glptr_Indexs GET_Indexs(struct _glapi_table *disp) {
+static inline _glptr_Indexs GET_Indexs(struct _glapi_table *disp) {
    return (_glptr_Indexs) (GET_by_offset(disp, _gloffset_Indexs));
 }
 
-static INLINE void SET_Indexs(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort)) {
+static inline void SET_Indexs(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort)) {
    SET_by_offset(disp, _gloffset_Indexs, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexsv)(const GLshort *);
 #define CALL_Indexsv(disp, parameters) \
     (* GET_Indexsv(disp)) parameters
-static INLINE _glptr_Indexsv GET_Indexsv(struct _glapi_table *disp) {
+static inline _glptr_Indexsv GET_Indexsv(struct _glapi_table *disp) {
    return (_glptr_Indexsv) (GET_by_offset(disp, _gloffset_Indexsv));
 }
 
-static INLINE void SET_Indexsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Indexsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Indexsv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3b)(GLbyte, GLbyte, GLbyte);
 #define CALL_Normal3b(disp, parameters) \
     (* GET_Normal3b(disp)) parameters
-static INLINE _glptr_Normal3b GET_Normal3b(struct _glapi_table *disp) {
+static inline _glptr_Normal3b GET_Normal3b(struct _glapi_table *disp) {
    return (_glptr_Normal3b) (GET_by_offset(disp, _gloffset_Normal3b));
 }
 
-static INLINE void SET_Normal3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
+static inline void SET_Normal3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
    SET_by_offset(disp, _gloffset_Normal3b, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3bv)(const GLbyte *);
 #define CALL_Normal3bv(disp, parameters) \
     (* GET_Normal3bv(disp)) parameters
-static INLINE _glptr_Normal3bv GET_Normal3bv(struct _glapi_table *disp) {
+static inline _glptr_Normal3bv GET_Normal3bv(struct _glapi_table *disp) {
    return (_glptr_Normal3bv) (GET_by_offset(disp, _gloffset_Normal3bv));
 }
 
-static INLINE void SET_Normal3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
+static inline void SET_Normal3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
    SET_by_offset(disp, _gloffset_Normal3bv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_Normal3d(disp, parameters) \
     (* GET_Normal3d(disp)) parameters
-static INLINE _glptr_Normal3d GET_Normal3d(struct _glapi_table *disp) {
+static inline _glptr_Normal3d GET_Normal3d(struct _glapi_table *disp) {
    return (_glptr_Normal3d) (GET_by_offset(disp, _gloffset_Normal3d));
 }
 
-static INLINE void SET_Normal3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Normal3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Normal3d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3dv)(const GLdouble *);
 #define CALL_Normal3dv(disp, parameters) \
     (* GET_Normal3dv(disp)) parameters
-static INLINE _glptr_Normal3dv GET_Normal3dv(struct _glapi_table *disp) {
+static inline _glptr_Normal3dv GET_Normal3dv(struct _glapi_table *disp) {
    return (_glptr_Normal3dv) (GET_by_offset(disp, _gloffset_Normal3dv));
 }
 
-static INLINE void SET_Normal3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Normal3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Normal3dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_Normal3f(disp, parameters) \
     (* GET_Normal3f(disp)) parameters
-static INLINE _glptr_Normal3f GET_Normal3f(struct _glapi_table *disp) {
+static inline _glptr_Normal3f GET_Normal3f(struct _glapi_table *disp) {
    return (_glptr_Normal3f) (GET_by_offset(disp, _gloffset_Normal3f));
 }
 
-static INLINE void SET_Normal3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Normal3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Normal3f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3fv)(const GLfloat *);
 #define CALL_Normal3fv(disp, parameters) \
     (* GET_Normal3fv(disp)) parameters
-static INLINE _glptr_Normal3fv GET_Normal3fv(struct _glapi_table *disp) {
+static inline _glptr_Normal3fv GET_Normal3fv(struct _glapi_table *disp) {
    return (_glptr_Normal3fv) (GET_by_offset(disp, _gloffset_Normal3fv));
 }
 
-static INLINE void SET_Normal3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Normal3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Normal3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3i)(GLint, GLint, GLint);
 #define CALL_Normal3i(disp, parameters) \
     (* GET_Normal3i(disp)) parameters
-static INLINE _glptr_Normal3i GET_Normal3i(struct _glapi_table *disp) {
+static inline _glptr_Normal3i GET_Normal3i(struct _glapi_table *disp) {
    return (_glptr_Normal3i) (GET_by_offset(disp, _gloffset_Normal3i));
 }
 
-static INLINE void SET_Normal3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_Normal3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Normal3i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3iv)(const GLint *);
 #define CALL_Normal3iv(disp, parameters) \
     (* GET_Normal3iv(disp)) parameters
-static INLINE _glptr_Normal3iv GET_Normal3iv(struct _glapi_table *disp) {
+static inline _glptr_Normal3iv GET_Normal3iv(struct _glapi_table *disp) {
    return (_glptr_Normal3iv) (GET_by_offset(disp, _gloffset_Normal3iv));
 }
 
-static INLINE void SET_Normal3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Normal3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Normal3iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3s)(GLshort, GLshort, GLshort);
 #define CALL_Normal3s(disp, parameters) \
     (* GET_Normal3s(disp)) parameters
-static INLINE _glptr_Normal3s GET_Normal3s(struct _glapi_table *disp) {
+static inline _glptr_Normal3s GET_Normal3s(struct _glapi_table *disp) {
    return (_glptr_Normal3s) (GET_by_offset(disp, _gloffset_Normal3s));
 }
 
-static INLINE void SET_Normal3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_Normal3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Normal3s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Normal3sv)(const GLshort *);
 #define CALL_Normal3sv(disp, parameters) \
     (* GET_Normal3sv(disp)) parameters
-static INLINE _glptr_Normal3sv GET_Normal3sv(struct _glapi_table *disp) {
+static inline _glptr_Normal3sv GET_Normal3sv(struct _glapi_table *disp) {
    return (_glptr_Normal3sv) (GET_by_offset(disp, _gloffset_Normal3sv));
 }
 
-static INLINE void SET_Normal3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Normal3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Normal3sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2d)(GLdouble, GLdouble);
 #define CALL_RasterPos2d(disp, parameters) \
     (* GET_RasterPos2d(disp)) parameters
-static INLINE _glptr_RasterPos2d GET_RasterPos2d(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2d GET_RasterPos2d(struct _glapi_table *disp) {
    return (_glptr_RasterPos2d) (GET_by_offset(disp, _gloffset_RasterPos2d));
 }
 
-static INLINE void SET_RasterPos2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
+static inline void SET_RasterPos2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_RasterPos2d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2dv)(const GLdouble *);
 #define CALL_RasterPos2dv(disp, parameters) \
     (* GET_RasterPos2dv(disp)) parameters
-static INLINE _glptr_RasterPos2dv GET_RasterPos2dv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2dv GET_RasterPos2dv(struct _glapi_table *disp) {
    return (_glptr_RasterPos2dv) (GET_by_offset(disp, _gloffset_RasterPos2dv));
 }
 
-static INLINE void SET_RasterPos2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_RasterPos2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_RasterPos2dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2f)(GLfloat, GLfloat);
 #define CALL_RasterPos2f(disp, parameters) \
     (* GET_RasterPos2f(disp)) parameters
-static INLINE _glptr_RasterPos2f GET_RasterPos2f(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2f GET_RasterPos2f(struct _glapi_table *disp) {
    return (_glptr_RasterPos2f) (GET_by_offset(disp, _gloffset_RasterPos2f));
 }
 
-static INLINE void SET_RasterPos2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_RasterPos2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_RasterPos2f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2fv)(const GLfloat *);
 #define CALL_RasterPos2fv(disp, parameters) \
     (* GET_RasterPos2fv(disp)) parameters
-static INLINE _glptr_RasterPos2fv GET_RasterPos2fv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2fv GET_RasterPos2fv(struct _glapi_table *disp) {
    return (_glptr_RasterPos2fv) (GET_by_offset(disp, _gloffset_RasterPos2fv));
 }
 
-static INLINE void SET_RasterPos2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_RasterPos2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_RasterPos2fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2i)(GLint, GLint);
 #define CALL_RasterPos2i(disp, parameters) \
     (* GET_RasterPos2i(disp)) parameters
-static INLINE _glptr_RasterPos2i GET_RasterPos2i(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2i GET_RasterPos2i(struct _glapi_table *disp) {
    return (_glptr_RasterPos2i) (GET_by_offset(disp, _gloffset_RasterPos2i));
 }
 
-static INLINE void SET_RasterPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+static inline void SET_RasterPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
    SET_by_offset(disp, _gloffset_RasterPos2i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2iv)(const GLint *);
 #define CALL_RasterPos2iv(disp, parameters) \
     (* GET_RasterPos2iv(disp)) parameters
-static INLINE _glptr_RasterPos2iv GET_RasterPos2iv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2iv GET_RasterPos2iv(struct _glapi_table *disp) {
    return (_glptr_RasterPos2iv) (GET_by_offset(disp, _gloffset_RasterPos2iv));
 }
 
-static INLINE void SET_RasterPos2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_RasterPos2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_RasterPos2iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2s)(GLshort, GLshort);
 #define CALL_RasterPos2s(disp, parameters) \
     (* GET_RasterPos2s(disp)) parameters
-static INLINE _glptr_RasterPos2s GET_RasterPos2s(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2s GET_RasterPos2s(struct _glapi_table *disp) {
    return (_glptr_RasterPos2s) (GET_by_offset(disp, _gloffset_RasterPos2s));
 }
 
-static INLINE void SET_RasterPos2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
+static inline void SET_RasterPos2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_RasterPos2s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos2sv)(const GLshort *);
 #define CALL_RasterPos2sv(disp, parameters) \
     (* GET_RasterPos2sv(disp)) parameters
-static INLINE _glptr_RasterPos2sv GET_RasterPos2sv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos2sv GET_RasterPos2sv(struct _glapi_table *disp) {
    return (_glptr_RasterPos2sv) (GET_by_offset(disp, _gloffset_RasterPos2sv));
 }
 
-static INLINE void SET_RasterPos2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_RasterPos2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_RasterPos2sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_RasterPos3d(disp, parameters) \
     (* GET_RasterPos3d(disp)) parameters
-static INLINE _glptr_RasterPos3d GET_RasterPos3d(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3d GET_RasterPos3d(struct _glapi_table *disp) {
    return (_glptr_RasterPos3d) (GET_by_offset(disp, _gloffset_RasterPos3d));
 }
 
-static INLINE void SET_RasterPos3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_RasterPos3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_RasterPos3d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3dv)(const GLdouble *);
 #define CALL_RasterPos3dv(disp, parameters) \
     (* GET_RasterPos3dv(disp)) parameters
-static INLINE _glptr_RasterPos3dv GET_RasterPos3dv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3dv GET_RasterPos3dv(struct _glapi_table *disp) {
    return (_glptr_RasterPos3dv) (GET_by_offset(disp, _gloffset_RasterPos3dv));
 }
 
-static INLINE void SET_RasterPos3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_RasterPos3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_RasterPos3dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_RasterPos3f(disp, parameters) \
     (* GET_RasterPos3f(disp)) parameters
-static INLINE _glptr_RasterPos3f GET_RasterPos3f(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3f GET_RasterPos3f(struct _glapi_table *disp) {
    return (_glptr_RasterPos3f) (GET_by_offset(disp, _gloffset_RasterPos3f));
 }
 
-static INLINE void SET_RasterPos3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_RasterPos3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_RasterPos3f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3fv)(const GLfloat *);
 #define CALL_RasterPos3fv(disp, parameters) \
     (* GET_RasterPos3fv(disp)) parameters
-static INLINE _glptr_RasterPos3fv GET_RasterPos3fv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3fv GET_RasterPos3fv(struct _glapi_table *disp) {
    return (_glptr_RasterPos3fv) (GET_by_offset(disp, _gloffset_RasterPos3fv));
 }
 
-static INLINE void SET_RasterPos3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_RasterPos3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_RasterPos3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3i)(GLint, GLint, GLint);
 #define CALL_RasterPos3i(disp, parameters) \
     (* GET_RasterPos3i(disp)) parameters
-static INLINE _glptr_RasterPos3i GET_RasterPos3i(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3i GET_RasterPos3i(struct _glapi_table *disp) {
    return (_glptr_RasterPos3i) (GET_by_offset(disp, _gloffset_RasterPos3i));
 }
 
-static INLINE void SET_RasterPos3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_RasterPos3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_RasterPos3i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3iv)(const GLint *);
 #define CALL_RasterPos3iv(disp, parameters) \
     (* GET_RasterPos3iv(disp)) parameters
-static INLINE _glptr_RasterPos3iv GET_RasterPos3iv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3iv GET_RasterPos3iv(struct _glapi_table *disp) {
    return (_glptr_RasterPos3iv) (GET_by_offset(disp, _gloffset_RasterPos3iv));
 }
 
-static INLINE void SET_RasterPos3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_RasterPos3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_RasterPos3iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3s)(GLshort, GLshort, GLshort);
 #define CALL_RasterPos3s(disp, parameters) \
     (* GET_RasterPos3s(disp)) parameters
-static INLINE _glptr_RasterPos3s GET_RasterPos3s(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3s GET_RasterPos3s(struct _glapi_table *disp) {
    return (_glptr_RasterPos3s) (GET_by_offset(disp, _gloffset_RasterPos3s));
 }
 
-static INLINE void SET_RasterPos3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_RasterPos3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_RasterPos3s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos3sv)(const GLshort *);
 #define CALL_RasterPos3sv(disp, parameters) \
     (* GET_RasterPos3sv(disp)) parameters
-static INLINE _glptr_RasterPos3sv GET_RasterPos3sv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos3sv GET_RasterPos3sv(struct _glapi_table *disp) {
    return (_glptr_RasterPos3sv) (GET_by_offset(disp, _gloffset_RasterPos3sv));
 }
 
-static INLINE void SET_RasterPos3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_RasterPos3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_RasterPos3sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_RasterPos4d(disp, parameters) \
     (* GET_RasterPos4d(disp)) parameters
-static INLINE _glptr_RasterPos4d GET_RasterPos4d(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4d GET_RasterPos4d(struct _glapi_table *disp) {
    return (_glptr_RasterPos4d) (GET_by_offset(disp, _gloffset_RasterPos4d));
 }
 
-static INLINE void SET_RasterPos4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_RasterPos4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_RasterPos4d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4dv)(const GLdouble *);
 #define CALL_RasterPos4dv(disp, parameters) \
     (* GET_RasterPos4dv(disp)) parameters
-static INLINE _glptr_RasterPos4dv GET_RasterPos4dv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4dv GET_RasterPos4dv(struct _glapi_table *disp) {
    return (_glptr_RasterPos4dv) (GET_by_offset(disp, _gloffset_RasterPos4dv));
 }
 
-static INLINE void SET_RasterPos4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_RasterPos4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_RasterPos4dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_RasterPos4f(disp, parameters) \
     (* GET_RasterPos4f(disp)) parameters
-static INLINE _glptr_RasterPos4f GET_RasterPos4f(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4f GET_RasterPos4f(struct _glapi_table *disp) {
    return (_glptr_RasterPos4f) (GET_by_offset(disp, _gloffset_RasterPos4f));
 }
 
-static INLINE void SET_RasterPos4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_RasterPos4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_RasterPos4f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4fv)(const GLfloat *);
 #define CALL_RasterPos4fv(disp, parameters) \
     (* GET_RasterPos4fv(disp)) parameters
-static INLINE _glptr_RasterPos4fv GET_RasterPos4fv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4fv GET_RasterPos4fv(struct _glapi_table *disp) {
    return (_glptr_RasterPos4fv) (GET_by_offset(disp, _gloffset_RasterPos4fv));
 }
 
-static INLINE void SET_RasterPos4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_RasterPos4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_RasterPos4fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4i)(GLint, GLint, GLint, GLint);
 #define CALL_RasterPos4i(disp, parameters) \
     (* GET_RasterPos4i(disp)) parameters
-static INLINE _glptr_RasterPos4i GET_RasterPos4i(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4i GET_RasterPos4i(struct _glapi_table *disp) {
    return (_glptr_RasterPos4i) (GET_by_offset(disp, _gloffset_RasterPos4i));
 }
 
-static INLINE void SET_RasterPos4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_RasterPos4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_RasterPos4i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4iv)(const GLint *);
 #define CALL_RasterPos4iv(disp, parameters) \
     (* GET_RasterPos4iv(disp)) parameters
-static INLINE _glptr_RasterPos4iv GET_RasterPos4iv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4iv GET_RasterPos4iv(struct _glapi_table *disp) {
    return (_glptr_RasterPos4iv) (GET_by_offset(disp, _gloffset_RasterPos4iv));
 }
 
-static INLINE void SET_RasterPos4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_RasterPos4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_RasterPos4iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_RasterPos4s(disp, parameters) \
     (* GET_RasterPos4s(disp)) parameters
-static INLINE _glptr_RasterPos4s GET_RasterPos4s(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4s GET_RasterPos4s(struct _glapi_table *disp) {
    return (_glptr_RasterPos4s) (GET_by_offset(disp, _gloffset_RasterPos4s));
 }
 
-static INLINE void SET_RasterPos4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_RasterPos4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_RasterPos4s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RasterPos4sv)(const GLshort *);
 #define CALL_RasterPos4sv(disp, parameters) \
     (* GET_RasterPos4sv(disp)) parameters
-static INLINE _glptr_RasterPos4sv GET_RasterPos4sv(struct _glapi_table *disp) {
+static inline _glptr_RasterPos4sv GET_RasterPos4sv(struct _glapi_table *disp) {
    return (_glptr_RasterPos4sv) (GET_by_offset(disp, _gloffset_RasterPos4sv));
 }
 
-static INLINE void SET_RasterPos4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_RasterPos4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_RasterPos4sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rectd)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Rectd(disp, parameters) \
     (* GET_Rectd(disp)) parameters
-static INLINE _glptr_Rectd GET_Rectd(struct _glapi_table *disp) {
+static inline _glptr_Rectd GET_Rectd(struct _glapi_table *disp) {
    return (_glptr_Rectd) (GET_by_offset(disp, _gloffset_Rectd));
 }
 
-static INLINE void SET_Rectd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Rectd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Rectd, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rectdv)(const GLdouble *, const GLdouble *);
 #define CALL_Rectdv(disp, parameters) \
     (* GET_Rectdv(disp)) parameters
-static INLINE _glptr_Rectdv GET_Rectdv(struct _glapi_table *disp) {
+static inline _glptr_Rectdv GET_Rectdv(struct _glapi_table *disp) {
    return (_glptr_Rectdv) (GET_by_offset(disp, _gloffset_Rectdv));
 }
 
-static INLINE void SET_Rectdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *, const GLdouble *)) {
+static inline void SET_Rectdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Rectdv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rectf)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Rectf(disp, parameters) \
     (* GET_Rectf(disp)) parameters
-static INLINE _glptr_Rectf GET_Rectf(struct _glapi_table *disp) {
+static inline _glptr_Rectf GET_Rectf(struct _glapi_table *disp) {
    return (_glptr_Rectf) (GET_by_offset(disp, _gloffset_Rectf));
 }
 
-static INLINE void SET_Rectf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Rectf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Rectf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rectfv)(const GLfloat *, const GLfloat *);
 #define CALL_Rectfv(disp, parameters) \
     (* GET_Rectfv(disp)) parameters
-static INLINE _glptr_Rectfv GET_Rectfv(struct _glapi_table *disp) {
+static inline _glptr_Rectfv GET_Rectfv(struct _glapi_table *disp) {
    return (_glptr_Rectfv) (GET_by_offset(disp, _gloffset_Rectfv));
 }
 
-static INLINE void SET_Rectfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *, const GLfloat *)) {
+static inline void SET_Rectfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Rectfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Recti)(GLint, GLint, GLint, GLint);
 #define CALL_Recti(disp, parameters) \
     (* GET_Recti(disp)) parameters
-static INLINE _glptr_Recti GET_Recti(struct _glapi_table *disp) {
+static inline _glptr_Recti GET_Recti(struct _glapi_table *disp) {
    return (_glptr_Recti) (GET_by_offset(disp, _gloffset_Recti));
 }
 
-static INLINE void SET_Recti(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_Recti(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Recti, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rectiv)(const GLint *, const GLint *);
 #define CALL_Rectiv(disp, parameters) \
     (* GET_Rectiv(disp)) parameters
-static INLINE _glptr_Rectiv GET_Rectiv(struct _glapi_table *disp) {
+static inline _glptr_Rectiv GET_Rectiv(struct _glapi_table *disp) {
    return (_glptr_Rectiv) (GET_by_offset(disp, _gloffset_Rectiv));
 }
 
-static INLINE void SET_Rectiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *, const GLint *)) {
+static inline void SET_Rectiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *, const GLint *)) {
    SET_by_offset(disp, _gloffset_Rectiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rects)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_Rects(disp, parameters) \
     (* GET_Rects(disp)) parameters
-static INLINE _glptr_Rects GET_Rects(struct _glapi_table *disp) {
+static inline _glptr_Rects GET_Rects(struct _glapi_table *disp) {
    return (_glptr_Rects) (GET_by_offset(disp, _gloffset_Rects));
 }
 
-static INLINE void SET_Rects(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_Rects(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Rects, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rectsv)(const GLshort *, const GLshort *);
 #define CALL_Rectsv(disp, parameters) \
     (* GET_Rectsv(disp)) parameters
-static INLINE _glptr_Rectsv GET_Rectsv(struct _glapi_table *disp) {
+static inline _glptr_Rectsv GET_Rectsv(struct _glapi_table *disp) {
    return (_glptr_Rectsv) (GET_by_offset(disp, _gloffset_Rectsv));
 }
 
-static INLINE void SET_Rectsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *, const GLshort *)) {
+static inline void SET_Rectsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *, const GLshort *)) {
    SET_by_offset(disp, _gloffset_Rectsv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1d)(GLdouble);
 #define CALL_TexCoord1d(disp, parameters) \
     (* GET_TexCoord1d(disp)) parameters
-static INLINE _glptr_TexCoord1d GET_TexCoord1d(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1d GET_TexCoord1d(struct _glapi_table *disp) {
    return (_glptr_TexCoord1d) (GET_by_offset(disp, _gloffset_TexCoord1d));
 }
 
-static INLINE void SET_TexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
+static inline void SET_TexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
    SET_by_offset(disp, _gloffset_TexCoord1d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1dv)(const GLdouble *);
 #define CALL_TexCoord1dv(disp, parameters) \
     (* GET_TexCoord1dv(disp)) parameters
-static INLINE _glptr_TexCoord1dv GET_TexCoord1dv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1dv GET_TexCoord1dv(struct _glapi_table *disp) {
    return (_glptr_TexCoord1dv) (GET_by_offset(disp, _gloffset_TexCoord1dv));
 }
 
-static INLINE void SET_TexCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_TexCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_TexCoord1dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1f)(GLfloat);
 #define CALL_TexCoord1f(disp, parameters) \
     (* GET_TexCoord1f(disp)) parameters
-static INLINE _glptr_TexCoord1f GET_TexCoord1f(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1f GET_TexCoord1f(struct _glapi_table *disp) {
    return (_glptr_TexCoord1f) (GET_by_offset(disp, _gloffset_TexCoord1f));
 }
 
-static INLINE void SET_TexCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_TexCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_TexCoord1f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1fv)(const GLfloat *);
 #define CALL_TexCoord1fv(disp, parameters) \
     (* GET_TexCoord1fv(disp)) parameters
-static INLINE _glptr_TexCoord1fv GET_TexCoord1fv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1fv GET_TexCoord1fv(struct _glapi_table *disp) {
    return (_glptr_TexCoord1fv) (GET_by_offset(disp, _gloffset_TexCoord1fv));
 }
 
-static INLINE void SET_TexCoord1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_TexCoord1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexCoord1fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1i)(GLint);
 #define CALL_TexCoord1i(disp, parameters) \
     (* GET_TexCoord1i(disp)) parameters
-static INLINE _glptr_TexCoord1i GET_TexCoord1i(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1i GET_TexCoord1i(struct _glapi_table *disp) {
    return (_glptr_TexCoord1i) (GET_by_offset(disp, _gloffset_TexCoord1i));
 }
 
-static INLINE void SET_TexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
+static inline void SET_TexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
    SET_by_offset(disp, _gloffset_TexCoord1i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1iv)(const GLint *);
 #define CALL_TexCoord1iv(disp, parameters) \
     (* GET_TexCoord1iv(disp)) parameters
-static INLINE _glptr_TexCoord1iv GET_TexCoord1iv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1iv GET_TexCoord1iv(struct _glapi_table *disp) {
    return (_glptr_TexCoord1iv) (GET_by_offset(disp, _gloffset_TexCoord1iv));
 }
 
-static INLINE void SET_TexCoord1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_TexCoord1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_TexCoord1iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1s)(GLshort);
 #define CALL_TexCoord1s(disp, parameters) \
     (* GET_TexCoord1s(disp)) parameters
-static INLINE _glptr_TexCoord1s GET_TexCoord1s(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1s GET_TexCoord1s(struct _glapi_table *disp) {
    return (_glptr_TexCoord1s) (GET_by_offset(disp, _gloffset_TexCoord1s));
 }
 
-static INLINE void SET_TexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort)) {
+static inline void SET_TexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort)) {
    SET_by_offset(disp, _gloffset_TexCoord1s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord1sv)(const GLshort *);
 #define CALL_TexCoord1sv(disp, parameters) \
     (* GET_TexCoord1sv(disp)) parameters
-static INLINE _glptr_TexCoord1sv GET_TexCoord1sv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord1sv GET_TexCoord1sv(struct _glapi_table *disp) {
    return (_glptr_TexCoord1sv) (GET_by_offset(disp, _gloffset_TexCoord1sv));
 }
 
-static INLINE void SET_TexCoord1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_TexCoord1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_TexCoord1sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2d)(GLdouble, GLdouble);
 #define CALL_TexCoord2d(disp, parameters) \
     (* GET_TexCoord2d(disp)) parameters
-static INLINE _glptr_TexCoord2d GET_TexCoord2d(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2d GET_TexCoord2d(struct _glapi_table *disp) {
    return (_glptr_TexCoord2d) (GET_by_offset(disp, _gloffset_TexCoord2d));
 }
 
-static INLINE void SET_TexCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
+static inline void SET_TexCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_TexCoord2d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2dv)(const GLdouble *);
 #define CALL_TexCoord2dv(disp, parameters) \
     (* GET_TexCoord2dv(disp)) parameters
-static INLINE _glptr_TexCoord2dv GET_TexCoord2dv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2dv GET_TexCoord2dv(struct _glapi_table *disp) {
    return (_glptr_TexCoord2dv) (GET_by_offset(disp, _gloffset_TexCoord2dv));
 }
 
-static INLINE void SET_TexCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_TexCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_TexCoord2dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2f)(GLfloat, GLfloat);
 #define CALL_TexCoord2f(disp, parameters) \
     (* GET_TexCoord2f(disp)) parameters
-static INLINE _glptr_TexCoord2f GET_TexCoord2f(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2f GET_TexCoord2f(struct _glapi_table *disp) {
    return (_glptr_TexCoord2f) (GET_by_offset(disp, _gloffset_TexCoord2f));
 }
 
-static INLINE void SET_TexCoord2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_TexCoord2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_TexCoord2f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2fv)(const GLfloat *);
 #define CALL_TexCoord2fv(disp, parameters) \
     (* GET_TexCoord2fv(disp)) parameters
-static INLINE _glptr_TexCoord2fv GET_TexCoord2fv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2fv GET_TexCoord2fv(struct _glapi_table *disp) {
    return (_glptr_TexCoord2fv) (GET_by_offset(disp, _gloffset_TexCoord2fv));
 }
 
-static INLINE void SET_TexCoord2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_TexCoord2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexCoord2fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2i)(GLint, GLint);
 #define CALL_TexCoord2i(disp, parameters) \
     (* GET_TexCoord2i(disp)) parameters
-static INLINE _glptr_TexCoord2i GET_TexCoord2i(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2i GET_TexCoord2i(struct _glapi_table *disp) {
    return (_glptr_TexCoord2i) (GET_by_offset(disp, _gloffset_TexCoord2i));
 }
 
-static INLINE void SET_TexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+static inline void SET_TexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
    SET_by_offset(disp, _gloffset_TexCoord2i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2iv)(const GLint *);
 #define CALL_TexCoord2iv(disp, parameters) \
     (* GET_TexCoord2iv(disp)) parameters
-static INLINE _glptr_TexCoord2iv GET_TexCoord2iv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2iv GET_TexCoord2iv(struct _glapi_table *disp) {
    return (_glptr_TexCoord2iv) (GET_by_offset(disp, _gloffset_TexCoord2iv));
 }
 
-static INLINE void SET_TexCoord2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_TexCoord2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_TexCoord2iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2s)(GLshort, GLshort);
 #define CALL_TexCoord2s(disp, parameters) \
     (* GET_TexCoord2s(disp)) parameters
-static INLINE _glptr_TexCoord2s GET_TexCoord2s(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2s GET_TexCoord2s(struct _glapi_table *disp) {
    return (_glptr_TexCoord2s) (GET_by_offset(disp, _gloffset_TexCoord2s));
 }
 
-static INLINE void SET_TexCoord2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
+static inline void SET_TexCoord2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_TexCoord2s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord2sv)(const GLshort *);
 #define CALL_TexCoord2sv(disp, parameters) \
     (* GET_TexCoord2sv(disp)) parameters
-static INLINE _glptr_TexCoord2sv GET_TexCoord2sv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord2sv GET_TexCoord2sv(struct _glapi_table *disp) {
    return (_glptr_TexCoord2sv) (GET_by_offset(disp, _gloffset_TexCoord2sv));
 }
 
-static INLINE void SET_TexCoord2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_TexCoord2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_TexCoord2sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_TexCoord3d(disp, parameters) \
     (* GET_TexCoord3d(disp)) parameters
-static INLINE _glptr_TexCoord3d GET_TexCoord3d(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3d GET_TexCoord3d(struct _glapi_table *disp) {
    return (_glptr_TexCoord3d) (GET_by_offset(disp, _gloffset_TexCoord3d));
 }
 
-static INLINE void SET_TexCoord3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_TexCoord3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_TexCoord3d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3dv)(const GLdouble *);
 #define CALL_TexCoord3dv(disp, parameters) \
     (* GET_TexCoord3dv(disp)) parameters
-static INLINE _glptr_TexCoord3dv GET_TexCoord3dv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3dv GET_TexCoord3dv(struct _glapi_table *disp) {
    return (_glptr_TexCoord3dv) (GET_by_offset(disp, _gloffset_TexCoord3dv));
 }
 
-static INLINE void SET_TexCoord3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_TexCoord3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_TexCoord3dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_TexCoord3f(disp, parameters) \
     (* GET_TexCoord3f(disp)) parameters
-static INLINE _glptr_TexCoord3f GET_TexCoord3f(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3f GET_TexCoord3f(struct _glapi_table *disp) {
    return (_glptr_TexCoord3f) (GET_by_offset(disp, _gloffset_TexCoord3f));
 }
 
-static INLINE void SET_TexCoord3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_TexCoord3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_TexCoord3f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3fv)(const GLfloat *);
 #define CALL_TexCoord3fv(disp, parameters) \
     (* GET_TexCoord3fv(disp)) parameters
-static INLINE _glptr_TexCoord3fv GET_TexCoord3fv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3fv GET_TexCoord3fv(struct _glapi_table *disp) {
    return (_glptr_TexCoord3fv) (GET_by_offset(disp, _gloffset_TexCoord3fv));
 }
 
-static INLINE void SET_TexCoord3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_TexCoord3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexCoord3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3i)(GLint, GLint, GLint);
 #define CALL_TexCoord3i(disp, parameters) \
     (* GET_TexCoord3i(disp)) parameters
-static INLINE _glptr_TexCoord3i GET_TexCoord3i(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3i GET_TexCoord3i(struct _glapi_table *disp) {
    return (_glptr_TexCoord3i) (GET_by_offset(disp, _gloffset_TexCoord3i));
 }
 
-static INLINE void SET_TexCoord3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_TexCoord3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_TexCoord3i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3iv)(const GLint *);
 #define CALL_TexCoord3iv(disp, parameters) \
     (* GET_TexCoord3iv(disp)) parameters
-static INLINE _glptr_TexCoord3iv GET_TexCoord3iv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3iv GET_TexCoord3iv(struct _glapi_table *disp) {
    return (_glptr_TexCoord3iv) (GET_by_offset(disp, _gloffset_TexCoord3iv));
 }
 
-static INLINE void SET_TexCoord3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_TexCoord3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_TexCoord3iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3s)(GLshort, GLshort, GLshort);
 #define CALL_TexCoord3s(disp, parameters) \
     (* GET_TexCoord3s(disp)) parameters
-static INLINE _glptr_TexCoord3s GET_TexCoord3s(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3s GET_TexCoord3s(struct _glapi_table *disp) {
    return (_glptr_TexCoord3s) (GET_by_offset(disp, _gloffset_TexCoord3s));
 }
 
-static INLINE void SET_TexCoord3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_TexCoord3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_TexCoord3s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord3sv)(const GLshort *);
 #define CALL_TexCoord3sv(disp, parameters) \
     (* GET_TexCoord3sv(disp)) parameters
-static INLINE _glptr_TexCoord3sv GET_TexCoord3sv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord3sv GET_TexCoord3sv(struct _glapi_table *disp) {
    return (_glptr_TexCoord3sv) (GET_by_offset(disp, _gloffset_TexCoord3sv));
 }
 
-static INLINE void SET_TexCoord3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_TexCoord3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_TexCoord3sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_TexCoord4d(disp, parameters) \
     (* GET_TexCoord4d(disp)) parameters
-static INLINE _glptr_TexCoord4d GET_TexCoord4d(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4d GET_TexCoord4d(struct _glapi_table *disp) {
    return (_glptr_TexCoord4d) (GET_by_offset(disp, _gloffset_TexCoord4d));
 }
 
-static INLINE void SET_TexCoord4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_TexCoord4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_TexCoord4d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4dv)(const GLdouble *);
 #define CALL_TexCoord4dv(disp, parameters) \
     (* GET_TexCoord4dv(disp)) parameters
-static INLINE _glptr_TexCoord4dv GET_TexCoord4dv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4dv GET_TexCoord4dv(struct _glapi_table *disp) {
    return (_glptr_TexCoord4dv) (GET_by_offset(disp, _gloffset_TexCoord4dv));
 }
 
-static INLINE void SET_TexCoord4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_TexCoord4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_TexCoord4dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_TexCoord4f(disp, parameters) \
     (* GET_TexCoord4f(disp)) parameters
-static INLINE _glptr_TexCoord4f GET_TexCoord4f(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4f GET_TexCoord4f(struct _glapi_table *disp) {
    return (_glptr_TexCoord4f) (GET_by_offset(disp, _gloffset_TexCoord4f));
 }
 
-static INLINE void SET_TexCoord4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_TexCoord4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_TexCoord4f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4fv)(const GLfloat *);
 #define CALL_TexCoord4fv(disp, parameters) \
     (* GET_TexCoord4fv(disp)) parameters
-static INLINE _glptr_TexCoord4fv GET_TexCoord4fv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4fv GET_TexCoord4fv(struct _glapi_table *disp) {
    return (_glptr_TexCoord4fv) (GET_by_offset(disp, _gloffset_TexCoord4fv));
 }
 
-static INLINE void SET_TexCoord4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_TexCoord4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexCoord4fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4i)(GLint, GLint, GLint, GLint);
 #define CALL_TexCoord4i(disp, parameters) \
     (* GET_TexCoord4i(disp)) parameters
-static INLINE _glptr_TexCoord4i GET_TexCoord4i(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4i GET_TexCoord4i(struct _glapi_table *disp) {
    return (_glptr_TexCoord4i) (GET_by_offset(disp, _gloffset_TexCoord4i));
 }
 
-static INLINE void SET_TexCoord4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_TexCoord4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_TexCoord4i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4iv)(const GLint *);
 #define CALL_TexCoord4iv(disp, parameters) \
     (* GET_TexCoord4iv(disp)) parameters
-static INLINE _glptr_TexCoord4iv GET_TexCoord4iv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4iv GET_TexCoord4iv(struct _glapi_table *disp) {
    return (_glptr_TexCoord4iv) (GET_by_offset(disp, _gloffset_TexCoord4iv));
 }
 
-static INLINE void SET_TexCoord4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_TexCoord4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_TexCoord4iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_TexCoord4s(disp, parameters) \
     (* GET_TexCoord4s(disp)) parameters
-static INLINE _glptr_TexCoord4s GET_TexCoord4s(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4s GET_TexCoord4s(struct _glapi_table *disp) {
    return (_glptr_TexCoord4s) (GET_by_offset(disp, _gloffset_TexCoord4s));
 }
 
-static INLINE void SET_TexCoord4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_TexCoord4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_TexCoord4s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoord4sv)(const GLshort *);
 #define CALL_TexCoord4sv(disp, parameters) \
     (* GET_TexCoord4sv(disp)) parameters
-static INLINE _glptr_TexCoord4sv GET_TexCoord4sv(struct _glapi_table *disp) {
+static inline _glptr_TexCoord4sv GET_TexCoord4sv(struct _glapi_table *disp) {
    return (_glptr_TexCoord4sv) (GET_by_offset(disp, _gloffset_TexCoord4sv));
 }
 
-static INLINE void SET_TexCoord4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_TexCoord4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_TexCoord4sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2d)(GLdouble, GLdouble);
 #define CALL_Vertex2d(disp, parameters) \
     (* GET_Vertex2d(disp)) parameters
-static INLINE _glptr_Vertex2d GET_Vertex2d(struct _glapi_table *disp) {
+static inline _glptr_Vertex2d GET_Vertex2d(struct _glapi_table *disp) {
    return (_glptr_Vertex2d) (GET_by_offset(disp, _gloffset_Vertex2d));
 }
 
-static INLINE void SET_Vertex2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
+static inline void SET_Vertex2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Vertex2d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2dv)(const GLdouble *);
 #define CALL_Vertex2dv(disp, parameters) \
     (* GET_Vertex2dv(disp)) parameters
-static INLINE _glptr_Vertex2dv GET_Vertex2dv(struct _glapi_table *disp) {
+static inline _glptr_Vertex2dv GET_Vertex2dv(struct _glapi_table *disp) {
    return (_glptr_Vertex2dv) (GET_by_offset(disp, _gloffset_Vertex2dv));
 }
 
-static INLINE void SET_Vertex2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Vertex2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Vertex2dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2f)(GLfloat, GLfloat);
 #define CALL_Vertex2f(disp, parameters) \
     (* GET_Vertex2f(disp)) parameters
-static INLINE _glptr_Vertex2f GET_Vertex2f(struct _glapi_table *disp) {
+static inline _glptr_Vertex2f GET_Vertex2f(struct _glapi_table *disp) {
    return (_glptr_Vertex2f) (GET_by_offset(disp, _gloffset_Vertex2f));
 }
 
-static INLINE void SET_Vertex2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_Vertex2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Vertex2f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2fv)(const GLfloat *);
 #define CALL_Vertex2fv(disp, parameters) \
     (* GET_Vertex2fv(disp)) parameters
-static INLINE _glptr_Vertex2fv GET_Vertex2fv(struct _glapi_table *disp) {
+static inline _glptr_Vertex2fv GET_Vertex2fv(struct _glapi_table *disp) {
    return (_glptr_Vertex2fv) (GET_by_offset(disp, _gloffset_Vertex2fv));
 }
 
-static INLINE void SET_Vertex2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Vertex2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Vertex2fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2i)(GLint, GLint);
 #define CALL_Vertex2i(disp, parameters) \
     (* GET_Vertex2i(disp)) parameters
-static INLINE _glptr_Vertex2i GET_Vertex2i(struct _glapi_table *disp) {
+static inline _glptr_Vertex2i GET_Vertex2i(struct _glapi_table *disp) {
    return (_glptr_Vertex2i) (GET_by_offset(disp, _gloffset_Vertex2i));
 }
 
-static INLINE void SET_Vertex2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+static inline void SET_Vertex2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Vertex2i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2iv)(const GLint *);
 #define CALL_Vertex2iv(disp, parameters) \
     (* GET_Vertex2iv(disp)) parameters
-static INLINE _glptr_Vertex2iv GET_Vertex2iv(struct _glapi_table *disp) {
+static inline _glptr_Vertex2iv GET_Vertex2iv(struct _glapi_table *disp) {
    return (_glptr_Vertex2iv) (GET_by_offset(disp, _gloffset_Vertex2iv));
 }
 
-static INLINE void SET_Vertex2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Vertex2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Vertex2iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2s)(GLshort, GLshort);
 #define CALL_Vertex2s(disp, parameters) \
     (* GET_Vertex2s(disp)) parameters
-static INLINE _glptr_Vertex2s GET_Vertex2s(struct _glapi_table *disp) {
+static inline _glptr_Vertex2s GET_Vertex2s(struct _glapi_table *disp) {
    return (_glptr_Vertex2s) (GET_by_offset(disp, _gloffset_Vertex2s));
 }
 
-static INLINE void SET_Vertex2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
+static inline void SET_Vertex2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Vertex2s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex2sv)(const GLshort *);
 #define CALL_Vertex2sv(disp, parameters) \
     (* GET_Vertex2sv(disp)) parameters
-static INLINE _glptr_Vertex2sv GET_Vertex2sv(struct _glapi_table *disp) {
+static inline _glptr_Vertex2sv GET_Vertex2sv(struct _glapi_table *disp) {
    return (_glptr_Vertex2sv) (GET_by_offset(disp, _gloffset_Vertex2sv));
 }
 
-static INLINE void SET_Vertex2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Vertex2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Vertex2sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_Vertex3d(disp, parameters) \
     (* GET_Vertex3d(disp)) parameters
-static INLINE _glptr_Vertex3d GET_Vertex3d(struct _glapi_table *disp) {
+static inline _glptr_Vertex3d GET_Vertex3d(struct _glapi_table *disp) {
    return (_glptr_Vertex3d) (GET_by_offset(disp, _gloffset_Vertex3d));
 }
 
-static INLINE void SET_Vertex3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Vertex3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Vertex3d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3dv)(const GLdouble *);
 #define CALL_Vertex3dv(disp, parameters) \
     (* GET_Vertex3dv(disp)) parameters
-static INLINE _glptr_Vertex3dv GET_Vertex3dv(struct _glapi_table *disp) {
+static inline _glptr_Vertex3dv GET_Vertex3dv(struct _glapi_table *disp) {
    return (_glptr_Vertex3dv) (GET_by_offset(disp, _gloffset_Vertex3dv));
 }
 
-static INLINE void SET_Vertex3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Vertex3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Vertex3dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_Vertex3f(disp, parameters) \
     (* GET_Vertex3f(disp)) parameters
-static INLINE _glptr_Vertex3f GET_Vertex3f(struct _glapi_table *disp) {
+static inline _glptr_Vertex3f GET_Vertex3f(struct _glapi_table *disp) {
    return (_glptr_Vertex3f) (GET_by_offset(disp, _gloffset_Vertex3f));
 }
 
-static INLINE void SET_Vertex3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Vertex3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Vertex3f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3fv)(const GLfloat *);
 #define CALL_Vertex3fv(disp, parameters) \
     (* GET_Vertex3fv(disp)) parameters
-static INLINE _glptr_Vertex3fv GET_Vertex3fv(struct _glapi_table *disp) {
+static inline _glptr_Vertex3fv GET_Vertex3fv(struct _glapi_table *disp) {
    return (_glptr_Vertex3fv) (GET_by_offset(disp, _gloffset_Vertex3fv));
 }
 
-static INLINE void SET_Vertex3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Vertex3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Vertex3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3i)(GLint, GLint, GLint);
 #define CALL_Vertex3i(disp, parameters) \
     (* GET_Vertex3i(disp)) parameters
-static INLINE _glptr_Vertex3i GET_Vertex3i(struct _glapi_table *disp) {
+static inline _glptr_Vertex3i GET_Vertex3i(struct _glapi_table *disp) {
    return (_glptr_Vertex3i) (GET_by_offset(disp, _gloffset_Vertex3i));
 }
 
-static INLINE void SET_Vertex3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_Vertex3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Vertex3i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3iv)(const GLint *);
 #define CALL_Vertex3iv(disp, parameters) \
     (* GET_Vertex3iv(disp)) parameters
-static INLINE _glptr_Vertex3iv GET_Vertex3iv(struct _glapi_table *disp) {
+static inline _glptr_Vertex3iv GET_Vertex3iv(struct _glapi_table *disp) {
    return (_glptr_Vertex3iv) (GET_by_offset(disp, _gloffset_Vertex3iv));
 }
 
-static INLINE void SET_Vertex3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Vertex3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Vertex3iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3s)(GLshort, GLshort, GLshort);
 #define CALL_Vertex3s(disp, parameters) \
     (* GET_Vertex3s(disp)) parameters
-static INLINE _glptr_Vertex3s GET_Vertex3s(struct _glapi_table *disp) {
+static inline _glptr_Vertex3s GET_Vertex3s(struct _glapi_table *disp) {
    return (_glptr_Vertex3s) (GET_by_offset(disp, _gloffset_Vertex3s));
 }
 
-static INLINE void SET_Vertex3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_Vertex3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Vertex3s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex3sv)(const GLshort *);
 #define CALL_Vertex3sv(disp, parameters) \
     (* GET_Vertex3sv(disp)) parameters
-static INLINE _glptr_Vertex3sv GET_Vertex3sv(struct _glapi_table *disp) {
+static inline _glptr_Vertex3sv GET_Vertex3sv(struct _glapi_table *disp) {
    return (_glptr_Vertex3sv) (GET_by_offset(disp, _gloffset_Vertex3sv));
 }
 
-static INLINE void SET_Vertex3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Vertex3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Vertex3sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Vertex4d(disp, parameters) \
     (* GET_Vertex4d(disp)) parameters
-static INLINE _glptr_Vertex4d GET_Vertex4d(struct _glapi_table *disp) {
+static inline _glptr_Vertex4d GET_Vertex4d(struct _glapi_table *disp) {
    return (_glptr_Vertex4d) (GET_by_offset(disp, _gloffset_Vertex4d));
 }
 
-static INLINE void SET_Vertex4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Vertex4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Vertex4d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4dv)(const GLdouble *);
 #define CALL_Vertex4dv(disp, parameters) \
     (* GET_Vertex4dv(disp)) parameters
-static INLINE _glptr_Vertex4dv GET_Vertex4dv(struct _glapi_table *disp) {
+static inline _glptr_Vertex4dv GET_Vertex4dv(struct _glapi_table *disp) {
    return (_glptr_Vertex4dv) (GET_by_offset(disp, _gloffset_Vertex4dv));
 }
 
-static INLINE void SET_Vertex4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_Vertex4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Vertex4dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Vertex4f(disp, parameters) \
     (* GET_Vertex4f(disp)) parameters
-static INLINE _glptr_Vertex4f GET_Vertex4f(struct _glapi_table *disp) {
+static inline _glptr_Vertex4f GET_Vertex4f(struct _glapi_table *disp) {
    return (_glptr_Vertex4f) (GET_by_offset(disp, _gloffset_Vertex4f));
 }
 
-static INLINE void SET_Vertex4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Vertex4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Vertex4f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4fv)(const GLfloat *);
 #define CALL_Vertex4fv(disp, parameters) \
     (* GET_Vertex4fv(disp)) parameters
-static INLINE _glptr_Vertex4fv GET_Vertex4fv(struct _glapi_table *disp) {
+static inline _glptr_Vertex4fv GET_Vertex4fv(struct _glapi_table *disp) {
    return (_glptr_Vertex4fv) (GET_by_offset(disp, _gloffset_Vertex4fv));
 }
 
-static INLINE void SET_Vertex4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_Vertex4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Vertex4fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4i)(GLint, GLint, GLint, GLint);
 #define CALL_Vertex4i(disp, parameters) \
     (* GET_Vertex4i(disp)) parameters
-static INLINE _glptr_Vertex4i GET_Vertex4i(struct _glapi_table *disp) {
+static inline _glptr_Vertex4i GET_Vertex4i(struct _glapi_table *disp) {
    return (_glptr_Vertex4i) (GET_by_offset(disp, _gloffset_Vertex4i));
 }
 
-static INLINE void SET_Vertex4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_Vertex4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Vertex4i, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4iv)(const GLint *);
 #define CALL_Vertex4iv(disp, parameters) \
     (* GET_Vertex4iv(disp)) parameters
-static INLINE _glptr_Vertex4iv GET_Vertex4iv(struct _glapi_table *disp) {
+static inline _glptr_Vertex4iv GET_Vertex4iv(struct _glapi_table *disp) {
    return (_glptr_Vertex4iv) (GET_by_offset(disp, _gloffset_Vertex4iv));
 }
 
-static INLINE void SET_Vertex4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_Vertex4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_Vertex4iv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_Vertex4s(disp, parameters) \
     (* GET_Vertex4s(disp)) parameters
-static INLINE _glptr_Vertex4s GET_Vertex4s(struct _glapi_table *disp) {
+static inline _glptr_Vertex4s GET_Vertex4s(struct _glapi_table *disp) {
    return (_glptr_Vertex4s) (GET_by_offset(disp, _gloffset_Vertex4s));
 }
 
-static INLINE void SET_Vertex4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_Vertex4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_Vertex4s, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Vertex4sv)(const GLshort *);
 #define CALL_Vertex4sv(disp, parameters) \
     (* GET_Vertex4sv(disp)) parameters
-static INLINE _glptr_Vertex4sv GET_Vertex4sv(struct _glapi_table *disp) {
+static inline _glptr_Vertex4sv GET_Vertex4sv(struct _glapi_table *disp) {
    return (_glptr_Vertex4sv) (GET_by_offset(disp, _gloffset_Vertex4sv));
 }
 
-static INLINE void SET_Vertex4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_Vertex4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_Vertex4sv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClipPlane)(GLenum, const GLdouble *);
 #define CALL_ClipPlane(disp, parameters) \
     (* GET_ClipPlane(disp)) parameters
-static INLINE _glptr_ClipPlane GET_ClipPlane(struct _glapi_table *disp) {
+static inline _glptr_ClipPlane GET_ClipPlane(struct _glapi_table *disp) {
    return (_glptr_ClipPlane) (GET_by_offset(disp, _gloffset_ClipPlane));
 }
 
-static INLINE void SET_ClipPlane(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+static inline void SET_ClipPlane(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_ClipPlane, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorMaterial)(GLenum, GLenum);
 #define CALL_ColorMaterial(disp, parameters) \
     (* GET_ColorMaterial(disp)) parameters
-static INLINE _glptr_ColorMaterial GET_ColorMaterial(struct _glapi_table *disp) {
+static inline _glptr_ColorMaterial GET_ColorMaterial(struct _glapi_table *disp) {
    return (_glptr_ColorMaterial) (GET_by_offset(disp, _gloffset_ColorMaterial));
 }
 
-static INLINE void SET_ColorMaterial(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_ColorMaterial(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_ColorMaterial, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CullFace)(GLenum);
 #define CALL_CullFace(disp, parameters) \
     (* GET_CullFace(disp)) parameters
-static INLINE _glptr_CullFace GET_CullFace(struct _glapi_table *disp) {
+static inline _glptr_CullFace GET_CullFace(struct _glapi_table *disp) {
    return (_glptr_CullFace) (GET_by_offset(disp, _gloffset_CullFace));
 }
 
-static INLINE void SET_CullFace(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_CullFace(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_CullFace, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Fogf)(GLenum, GLfloat);
 #define CALL_Fogf(disp, parameters) \
     (* GET_Fogf(disp)) parameters
-static INLINE _glptr_Fogf GET_Fogf(struct _glapi_table *disp) {
+static inline _glptr_Fogf GET_Fogf(struct _glapi_table *disp) {
    return (_glptr_Fogf) (GET_by_offset(disp, _gloffset_Fogf));
 }
 
-static INLINE void SET_Fogf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_Fogf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_Fogf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Fogfv)(GLenum, const GLfloat *);
 #define CALL_Fogfv(disp, parameters) \
     (* GET_Fogfv(disp)) parameters
-static INLINE _glptr_Fogfv GET_Fogfv(struct _glapi_table *disp) {
+static inline _glptr_Fogfv GET_Fogfv(struct _glapi_table *disp) {
    return (_glptr_Fogfv) (GET_by_offset(disp, _gloffset_Fogfv));
 }
 
-static INLINE void SET_Fogfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_Fogfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Fogfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Fogi)(GLenum, GLint);
 #define CALL_Fogi(disp, parameters) \
     (* GET_Fogi(disp)) parameters
-static INLINE _glptr_Fogi GET_Fogi(struct _glapi_table *disp) {
+static inline _glptr_Fogi GET_Fogi(struct _glapi_table *disp) {
    return (_glptr_Fogi) (GET_by_offset(disp, _gloffset_Fogi));
 }
 
-static INLINE void SET_Fogi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_Fogi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_Fogi, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Fogiv)(GLenum, const GLint *);
 #define CALL_Fogiv(disp, parameters) \
     (* GET_Fogiv(disp)) parameters
-static INLINE _glptr_Fogiv GET_Fogiv(struct _glapi_table *disp) {
+static inline _glptr_Fogiv GET_Fogiv(struct _glapi_table *disp) {
    return (_glptr_Fogiv) (GET_by_offset(disp, _gloffset_Fogiv));
 }
 
-static INLINE void SET_Fogiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_Fogiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_Fogiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FrontFace)(GLenum);
 #define CALL_FrontFace(disp, parameters) \
     (* GET_FrontFace(disp)) parameters
-static INLINE _glptr_FrontFace GET_FrontFace(struct _glapi_table *disp) {
+static inline _glptr_FrontFace GET_FrontFace(struct _glapi_table *disp) {
    return (_glptr_FrontFace) (GET_by_offset(disp, _gloffset_FrontFace));
 }
 
-static INLINE void SET_FrontFace(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_FrontFace(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_FrontFace, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Hint)(GLenum, GLenum);
 #define CALL_Hint(disp, parameters) \
     (* GET_Hint(disp)) parameters
-static INLINE _glptr_Hint GET_Hint(struct _glapi_table *disp) {
+static inline _glptr_Hint GET_Hint(struct _glapi_table *disp) {
    return (_glptr_Hint) (GET_by_offset(disp, _gloffset_Hint));
 }
 
-static INLINE void SET_Hint(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_Hint(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_Hint, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Lightf)(GLenum, GLenum, GLfloat);
 #define CALL_Lightf(disp, parameters) \
     (* GET_Lightf(disp)) parameters
-static INLINE _glptr_Lightf GET_Lightf(struct _glapi_table *disp) {
+static inline _glptr_Lightf GET_Lightf(struct _glapi_table *disp) {
    return (_glptr_Lightf) (GET_by_offset(disp, _gloffset_Lightf));
 }
 
-static INLINE void SET_Lightf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
+static inline void SET_Lightf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_Lightf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Lightfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_Lightfv(disp, parameters) \
     (* GET_Lightfv(disp)) parameters
-static INLINE _glptr_Lightfv GET_Lightfv(struct _glapi_table *disp) {
+static inline _glptr_Lightfv GET_Lightfv(struct _glapi_table *disp) {
    return (_glptr_Lightfv) (GET_by_offset(disp, _gloffset_Lightfv));
 }
 
-static INLINE void SET_Lightfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_Lightfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Lightfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Lighti)(GLenum, GLenum, GLint);
 #define CALL_Lighti(disp, parameters) \
     (* GET_Lighti(disp)) parameters
-static INLINE _glptr_Lighti GET_Lighti(struct _glapi_table *disp) {
+static inline _glptr_Lighti GET_Lighti(struct _glapi_table *disp) {
    return (_glptr_Lighti) (GET_by_offset(disp, _gloffset_Lighti));
 }
 
-static INLINE void SET_Lighti(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_Lighti(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_Lighti, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Lightiv)(GLenum, GLenum, const GLint *);
 #define CALL_Lightiv(disp, parameters) \
     (* GET_Lightiv(disp)) parameters
-static INLINE _glptr_Lightiv GET_Lightiv(struct _glapi_table *disp) {
+static inline _glptr_Lightiv GET_Lightiv(struct _glapi_table *disp) {
    return (_glptr_Lightiv) (GET_by_offset(disp, _gloffset_Lightiv));
 }
 
-static INLINE void SET_Lightiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_Lightiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_Lightiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LightModelf)(GLenum, GLfloat);
 #define CALL_LightModelf(disp, parameters) \
     (* GET_LightModelf(disp)) parameters
-static INLINE _glptr_LightModelf GET_LightModelf(struct _glapi_table *disp) {
+static inline _glptr_LightModelf GET_LightModelf(struct _glapi_table *disp) {
    return (_glptr_LightModelf) (GET_by_offset(disp, _gloffset_LightModelf));
 }
 
-static INLINE void SET_LightModelf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_LightModelf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_LightModelf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LightModelfv)(GLenum, const GLfloat *);
 #define CALL_LightModelfv(disp, parameters) \
     (* GET_LightModelfv(disp)) parameters
-static INLINE _glptr_LightModelfv GET_LightModelfv(struct _glapi_table *disp) {
+static inline _glptr_LightModelfv GET_LightModelfv(struct _glapi_table *disp) {
    return (_glptr_LightModelfv) (GET_by_offset(disp, _gloffset_LightModelfv));
 }
 
-static INLINE void SET_LightModelfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_LightModelfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_LightModelfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LightModeli)(GLenum, GLint);
 #define CALL_LightModeli(disp, parameters) \
     (* GET_LightModeli(disp)) parameters
-static INLINE _glptr_LightModeli GET_LightModeli(struct _glapi_table *disp) {
+static inline _glptr_LightModeli GET_LightModeli(struct _glapi_table *disp) {
    return (_glptr_LightModeli) (GET_by_offset(disp, _gloffset_LightModeli));
 }
 
-static INLINE void SET_LightModeli(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_LightModeli(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_LightModeli, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LightModeliv)(GLenum, const GLint *);
 #define CALL_LightModeliv(disp, parameters) \
     (* GET_LightModeliv(disp)) parameters
-static INLINE _glptr_LightModeliv GET_LightModeliv(struct _glapi_table *disp) {
+static inline _glptr_LightModeliv GET_LightModeliv(struct _glapi_table *disp) {
    return (_glptr_LightModeliv) (GET_by_offset(disp, _gloffset_LightModeliv));
 }
 
-static INLINE void SET_LightModeliv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_LightModeliv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_LightModeliv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LineStipple)(GLint, GLushort);
 #define CALL_LineStipple(disp, parameters) \
     (* GET_LineStipple(disp)) parameters
-static INLINE _glptr_LineStipple GET_LineStipple(struct _glapi_table *disp) {
+static inline _glptr_LineStipple GET_LineStipple(struct _glapi_table *disp) {
    return (_glptr_LineStipple) (GET_by_offset(disp, _gloffset_LineStipple));
 }
 
-static INLINE void SET_LineStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLushort)) {
+static inline void SET_LineStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLushort)) {
    SET_by_offset(disp, _gloffset_LineStipple, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LineWidth)(GLfloat);
 #define CALL_LineWidth(disp, parameters) \
     (* GET_LineWidth(disp)) parameters
-static INLINE _glptr_LineWidth GET_LineWidth(struct _glapi_table *disp) {
+static inline _glptr_LineWidth GET_LineWidth(struct _glapi_table *disp) {
    return (_glptr_LineWidth) (GET_by_offset(disp, _gloffset_LineWidth));
 }
 
-static INLINE void SET_LineWidth(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_LineWidth(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_LineWidth, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Materialf)(GLenum, GLenum, GLfloat);
 #define CALL_Materialf(disp, parameters) \
     (* GET_Materialf(disp)) parameters
-static INLINE _glptr_Materialf GET_Materialf(struct _glapi_table *disp) {
+static inline _glptr_Materialf GET_Materialf(struct _glapi_table *disp) {
    return (_glptr_Materialf) (GET_by_offset(disp, _gloffset_Materialf));
 }
 
-static INLINE void SET_Materialf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
+static inline void SET_Materialf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_Materialf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Materialfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_Materialfv(disp, parameters) \
     (* GET_Materialfv(disp)) parameters
-static INLINE _glptr_Materialfv GET_Materialfv(struct _glapi_table *disp) {
+static inline _glptr_Materialfv GET_Materialfv(struct _glapi_table *disp) {
    return (_glptr_Materialfv) (GET_by_offset(disp, _gloffset_Materialfv));
 }
 
-static INLINE void SET_Materialfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_Materialfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Materialfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Materiali)(GLenum, GLenum, GLint);
 #define CALL_Materiali(disp, parameters) \
     (* GET_Materiali(disp)) parameters
-static INLINE _glptr_Materiali GET_Materiali(struct _glapi_table *disp) {
+static inline _glptr_Materiali GET_Materiali(struct _glapi_table *disp) {
    return (_glptr_Materiali) (GET_by_offset(disp, _gloffset_Materiali));
 }
 
-static INLINE void SET_Materiali(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_Materiali(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_Materiali, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Materialiv)(GLenum, GLenum, const GLint *);
 #define CALL_Materialiv(disp, parameters) \
     (* GET_Materialiv(disp)) parameters
-static INLINE _glptr_Materialiv GET_Materialiv(struct _glapi_table *disp) {
+static inline _glptr_Materialiv GET_Materialiv(struct _glapi_table *disp) {
    return (_glptr_Materialiv) (GET_by_offset(disp, _gloffset_Materialiv));
 }
 
-static INLINE void SET_Materialiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_Materialiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_Materialiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PointSize)(GLfloat);
 #define CALL_PointSize(disp, parameters) \
     (* GET_PointSize(disp)) parameters
-static INLINE _glptr_PointSize GET_PointSize(struct _glapi_table *disp) {
+static inline _glptr_PointSize GET_PointSize(struct _glapi_table *disp) {
    return (_glptr_PointSize) (GET_by_offset(disp, _gloffset_PointSize));
 }
 
-static INLINE void SET_PointSize(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_PointSize(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_PointSize, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PolygonMode)(GLenum, GLenum);
 #define CALL_PolygonMode(disp, parameters) \
     (* GET_PolygonMode(disp)) parameters
-static INLINE _glptr_PolygonMode GET_PolygonMode(struct _glapi_table *disp) {
+static inline _glptr_PolygonMode GET_PolygonMode(struct _glapi_table *disp) {
    return (_glptr_PolygonMode) (GET_by_offset(disp, _gloffset_PolygonMode));
 }
 
-static INLINE void SET_PolygonMode(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_PolygonMode(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_PolygonMode, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PolygonStipple)(const GLubyte *);
 #define CALL_PolygonStipple(disp, parameters) \
     (* GET_PolygonStipple(disp)) parameters
-static INLINE _glptr_PolygonStipple GET_PolygonStipple(struct _glapi_table *disp) {
+static inline _glptr_PolygonStipple GET_PolygonStipple(struct _glapi_table *disp) {
    return (_glptr_PolygonStipple) (GET_by_offset(disp, _gloffset_PolygonStipple));
 }
 
-static INLINE void SET_PolygonStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
+static inline void SET_PolygonStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
    SET_by_offset(disp, _gloffset_PolygonStipple, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Scissor)(GLint, GLint, GLsizei, GLsizei);
 #define CALL_Scissor(disp, parameters) \
     (* GET_Scissor(disp)) parameters
-static INLINE _glptr_Scissor GET_Scissor(struct _glapi_table *disp) {
+static inline _glptr_Scissor GET_Scissor(struct _glapi_table *disp) {
    return (_glptr_Scissor) (GET_by_offset(disp, _gloffset_Scissor));
 }
 
-static INLINE void SET_Scissor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei)) {
+static inline void SET_Scissor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_Scissor, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ShadeModel)(GLenum);
 #define CALL_ShadeModel(disp, parameters) \
     (* GET_ShadeModel(disp)) parameters
-static INLINE _glptr_ShadeModel GET_ShadeModel(struct _glapi_table *disp) {
+static inline _glptr_ShadeModel GET_ShadeModel(struct _glapi_table *disp) {
    return (_glptr_ShadeModel) (GET_by_offset(disp, _gloffset_ShadeModel));
 }
 
-static INLINE void SET_ShadeModel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ShadeModel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ShadeModel, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexParameterf)(GLenum, GLenum, GLfloat);
 #define CALL_TexParameterf(disp, parameters) \
     (* GET_TexParameterf(disp)) parameters
-static INLINE _glptr_TexParameterf GET_TexParameterf(struct _glapi_table *disp) {
+static inline _glptr_TexParameterf GET_TexParameterf(struct _glapi_table *disp) {
    return (_glptr_TexParameterf) (GET_by_offset(disp, _gloffset_TexParameterf));
 }
 
-static INLINE void SET_TexParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
+static inline void SET_TexParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_TexParameterf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexParameterfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_TexParameterfv(disp, parameters) \
     (* GET_TexParameterfv(disp)) parameters
-static INLINE _glptr_TexParameterfv GET_TexParameterfv(struct _glapi_table *disp) {
+static inline _glptr_TexParameterfv GET_TexParameterfv(struct _glapi_table *disp) {
    return (_glptr_TexParameterfv) (GET_by_offset(disp, _gloffset_TexParameterfv));
 }
 
-static INLINE void SET_TexParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_TexParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexParameteri)(GLenum, GLenum, GLint);
 #define CALL_TexParameteri(disp, parameters) \
     (* GET_TexParameteri(disp)) parameters
-static INLINE _glptr_TexParameteri GET_TexParameteri(struct _glapi_table *disp) {
+static inline _glptr_TexParameteri GET_TexParameteri(struct _glapi_table *disp) {
    return (_glptr_TexParameteri) (GET_by_offset(disp, _gloffset_TexParameteri));
 }
 
-static INLINE void SET_TexParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_TexParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_TexParameteri, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexParameteriv)(GLenum, GLenum, const GLint *);
 #define CALL_TexParameteriv(disp, parameters) \
     (* GET_TexParameteriv(disp)) parameters
-static INLINE _glptr_TexParameteriv GET_TexParameteriv(struct _glapi_table *disp) {
+static inline _glptr_TexParameteriv GET_TexParameteriv(struct _glapi_table *disp) {
    return (_glptr_TexParameteriv) (GET_by_offset(disp, _gloffset_TexParameteriv));
 }
 
-static INLINE void SET_TexParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_TexParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_TexParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 #define CALL_TexImage1D(disp, parameters) \
     (* GET_TexImage1D(disp)) parameters
-static INLINE _glptr_TexImage1D GET_TexImage1D(struct _glapi_table *disp) {
+static inline _glptr_TexImage1D GET_TexImage1D(struct _glapi_table *disp) {
    return (_glptr_TexImage1D) (GET_by_offset(disp, _gloffset_TexImage1D));
 }
 
-static INLINE void SET_TexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_TexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexImage1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 #define CALL_TexImage2D(disp, parameters) \
     (* GET_TexImage2D(disp)) parameters
-static INLINE _glptr_TexImage2D GET_TexImage2D(struct _glapi_table *disp) {
+static inline _glptr_TexImage2D GET_TexImage2D(struct _glapi_table *disp) {
    return (_glptr_TexImage2D) (GET_by_offset(disp, _gloffset_TexImage2D));
 }
 
-static INLINE void SET_TexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_TexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexImage2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexEnvf)(GLenum, GLenum, GLfloat);
 #define CALL_TexEnvf(disp, parameters) \
     (* GET_TexEnvf(disp)) parameters
-static INLINE _glptr_TexEnvf GET_TexEnvf(struct _glapi_table *disp) {
+static inline _glptr_TexEnvf GET_TexEnvf(struct _glapi_table *disp) {
    return (_glptr_TexEnvf) (GET_by_offset(disp, _gloffset_TexEnvf));
 }
 
-static INLINE void SET_TexEnvf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
+static inline void SET_TexEnvf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_TexEnvf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexEnvfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_TexEnvfv(disp, parameters) \
     (* GET_TexEnvfv(disp)) parameters
-static INLINE _glptr_TexEnvfv GET_TexEnvfv(struct _glapi_table *disp) {
+static inline _glptr_TexEnvfv GET_TexEnvfv(struct _glapi_table *disp) {
    return (_glptr_TexEnvfv) (GET_by_offset(disp, _gloffset_TexEnvfv));
 }
 
-static INLINE void SET_TexEnvfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_TexEnvfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexEnvfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexEnvi)(GLenum, GLenum, GLint);
 #define CALL_TexEnvi(disp, parameters) \
     (* GET_TexEnvi(disp)) parameters
-static INLINE _glptr_TexEnvi GET_TexEnvi(struct _glapi_table *disp) {
+static inline _glptr_TexEnvi GET_TexEnvi(struct _glapi_table *disp) {
    return (_glptr_TexEnvi) (GET_by_offset(disp, _gloffset_TexEnvi));
 }
 
-static INLINE void SET_TexEnvi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_TexEnvi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_TexEnvi, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexEnviv)(GLenum, GLenum, const GLint *);
 #define CALL_TexEnviv(disp, parameters) \
     (* GET_TexEnviv(disp)) parameters
-static INLINE _glptr_TexEnviv GET_TexEnviv(struct _glapi_table *disp) {
+static inline _glptr_TexEnviv GET_TexEnviv(struct _glapi_table *disp) {
    return (_glptr_TexEnviv) (GET_by_offset(disp, _gloffset_TexEnviv));
 }
 
-static INLINE void SET_TexEnviv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_TexEnviv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_TexEnviv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexGend)(GLenum, GLenum, GLdouble);
 #define CALL_TexGend(disp, parameters) \
     (* GET_TexGend(disp)) parameters
-static INLINE _glptr_TexGend GET_TexGend(struct _glapi_table *disp) {
+static inline _glptr_TexGend GET_TexGend(struct _glapi_table *disp) {
    return (_glptr_TexGend) (GET_by_offset(disp, _gloffset_TexGend));
 }
 
-static INLINE void SET_TexGend(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble)) {
+static inline void SET_TexGend(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble)) {
    SET_by_offset(disp, _gloffset_TexGend, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexGendv)(GLenum, GLenum, const GLdouble *);
 #define CALL_TexGendv(disp, parameters) \
     (* GET_TexGendv(disp)) parameters
-static INLINE _glptr_TexGendv GET_TexGendv(struct _glapi_table *disp) {
+static inline _glptr_TexGendv GET_TexGendv(struct _glapi_table *disp) {
    return (_glptr_TexGendv) (GET_by_offset(disp, _gloffset_TexGendv));
 }
 
-static INLINE void SET_TexGendv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLdouble *)) {
+static inline void SET_TexGendv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_TexGendv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexGenf)(GLenum, GLenum, GLfloat);
 #define CALL_TexGenf(disp, parameters) \
     (* GET_TexGenf(disp)) parameters
-static INLINE _glptr_TexGenf GET_TexGenf(struct _glapi_table *disp) {
+static inline _glptr_TexGenf GET_TexGenf(struct _glapi_table *disp) {
    return (_glptr_TexGenf) (GET_by_offset(disp, _gloffset_TexGenf));
 }
 
-static INLINE void SET_TexGenf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
+static inline void SET_TexGenf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_TexGenf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexGenfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_TexGenfv(disp, parameters) \
     (* GET_TexGenfv(disp)) parameters
-static INLINE _glptr_TexGenfv GET_TexGenfv(struct _glapi_table *disp) {
+static inline _glptr_TexGenfv GET_TexGenfv(struct _glapi_table *disp) {
    return (_glptr_TexGenfv) (GET_by_offset(disp, _gloffset_TexGenfv));
 }
 
-static INLINE void SET_TexGenfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_TexGenfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexGenfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexGeni)(GLenum, GLenum, GLint);
 #define CALL_TexGeni(disp, parameters) \
     (* GET_TexGeni(disp)) parameters
-static INLINE _glptr_TexGeni GET_TexGeni(struct _glapi_table *disp) {
+static inline _glptr_TexGeni GET_TexGeni(struct _glapi_table *disp) {
    return (_glptr_TexGeni) (GET_by_offset(disp, _gloffset_TexGeni));
 }
 
-static INLINE void SET_TexGeni(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_TexGeni(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_TexGeni, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexGeniv)(GLenum, GLenum, const GLint *);
 #define CALL_TexGeniv(disp, parameters) \
     (* GET_TexGeniv(disp)) parameters
-static INLINE _glptr_TexGeniv GET_TexGeniv(struct _glapi_table *disp) {
+static inline _glptr_TexGeniv GET_TexGeniv(struct _glapi_table *disp) {
    return (_glptr_TexGeniv) (GET_by_offset(disp, _gloffset_TexGeniv));
 }
 
-static INLINE void SET_TexGeniv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_TexGeniv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_TexGeniv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FeedbackBuffer)(GLsizei, GLenum, GLfloat *);
 #define CALL_FeedbackBuffer(disp, parameters) \
     (* GET_FeedbackBuffer(disp)) parameters
-static INLINE _glptr_FeedbackBuffer GET_FeedbackBuffer(struct _glapi_table *disp) {
+static inline _glptr_FeedbackBuffer GET_FeedbackBuffer(struct _glapi_table *disp) {
    return (_glptr_FeedbackBuffer) (GET_by_offset(disp, _gloffset_FeedbackBuffer));
 }
 
-static INLINE void SET_FeedbackBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLenum, GLfloat *)) {
+static inline void SET_FeedbackBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_FeedbackBuffer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SelectBuffer)(GLsizei, GLuint *);
 #define CALL_SelectBuffer(disp, parameters) \
     (* GET_SelectBuffer(disp)) parameters
-static INLINE _glptr_SelectBuffer GET_SelectBuffer(struct _glapi_table *disp) {
+static inline _glptr_SelectBuffer GET_SelectBuffer(struct _glapi_table *disp) {
    return (_glptr_SelectBuffer) (GET_by_offset(disp, _gloffset_SelectBuffer));
 }
 
-static INLINE void SET_SelectBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_SelectBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_SelectBuffer, fn);
 }
 
 typedef GLint (GLAPIENTRYP _glptr_RenderMode)(GLenum);
 #define CALL_RenderMode(disp, parameters) \
     (* GET_RenderMode(disp)) parameters
-static INLINE _glptr_RenderMode GET_RenderMode(struct _glapi_table *disp) {
+static inline _glptr_RenderMode GET_RenderMode(struct _glapi_table *disp) {
    return (_glptr_RenderMode) (GET_by_offset(disp, _gloffset_RenderMode));
 }
 
-static INLINE void SET_RenderMode(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_RenderMode(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_RenderMode, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_InitNames)(void);
 #define CALL_InitNames(disp, parameters) \
     (* GET_InitNames(disp)) parameters
-static INLINE _glptr_InitNames GET_InitNames(struct _glapi_table *disp) {
+static inline _glptr_InitNames GET_InitNames(struct _glapi_table *disp) {
    return (_glptr_InitNames) (GET_by_offset(disp, _gloffset_InitNames));
 }
 
-static INLINE void SET_InitNames(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_InitNames(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_InitNames, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadName)(GLuint);
 #define CALL_LoadName(disp, parameters) \
     (* GET_LoadName(disp)) parameters
-static INLINE _glptr_LoadName GET_LoadName(struct _glapi_table *disp) {
+static inline _glptr_LoadName GET_LoadName(struct _glapi_table *disp) {
    return (_glptr_LoadName) (GET_by_offset(disp, _gloffset_LoadName));
 }
 
-static INLINE void SET_LoadName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_LoadName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_LoadName, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PassThrough)(GLfloat);
 #define CALL_PassThrough(disp, parameters) \
     (* GET_PassThrough(disp)) parameters
-static INLINE _glptr_PassThrough GET_PassThrough(struct _glapi_table *disp) {
+static inline _glptr_PassThrough GET_PassThrough(struct _glapi_table *disp) {
    return (_glptr_PassThrough) (GET_by_offset(disp, _gloffset_PassThrough));
 }
 
-static INLINE void SET_PassThrough(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_PassThrough(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_PassThrough, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PopName)(void);
 #define CALL_PopName(disp, parameters) \
     (* GET_PopName(disp)) parameters
-static INLINE _glptr_PopName GET_PopName(struct _glapi_table *disp) {
+static inline _glptr_PopName GET_PopName(struct _glapi_table *disp) {
    return (_glptr_PopName) (GET_by_offset(disp, _gloffset_PopName));
 }
 
-static INLINE void SET_PopName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PopName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PopName, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PushName)(GLuint);
 #define CALL_PushName(disp, parameters) \
     (* GET_PushName(disp)) parameters
-static INLINE _glptr_PushName GET_PushName(struct _glapi_table *disp) {
+static inline _glptr_PushName GET_PushName(struct _glapi_table *disp) {
    return (_glptr_PushName) (GET_by_offset(disp, _gloffset_PushName));
 }
 
-static INLINE void SET_PushName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_PushName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_PushName, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawBuffer)(GLenum);
 #define CALL_DrawBuffer(disp, parameters) \
     (* GET_DrawBuffer(disp)) parameters
-static INLINE _glptr_DrawBuffer GET_DrawBuffer(struct _glapi_table *disp) {
+static inline _glptr_DrawBuffer GET_DrawBuffer(struct _glapi_table *disp) {
    return (_glptr_DrawBuffer) (GET_by_offset(disp, _gloffset_DrawBuffer));
 }
 
-static INLINE void SET_DrawBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_DrawBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_DrawBuffer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Clear)(GLbitfield);
 #define CALL_Clear(disp, parameters) \
     (* GET_Clear(disp)) parameters
-static INLINE _glptr_Clear GET_Clear(struct _glapi_table *disp) {
+static inline _glptr_Clear GET_Clear(struct _glapi_table *disp) {
    return (_glptr_Clear) (GET_by_offset(disp, _gloffset_Clear));
 }
 
-static INLINE void SET_Clear(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) {
+static inline void SET_Clear(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) {
    SET_by_offset(disp, _gloffset_Clear, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearAccum)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_ClearAccum(disp, parameters) \
     (* GET_ClearAccum(disp)) parameters
-static INLINE _glptr_ClearAccum GET_ClearAccum(struct _glapi_table *disp) {
+static inline _glptr_ClearAccum GET_ClearAccum(struct _glapi_table *disp) {
    return (_glptr_ClearAccum) (GET_by_offset(disp, _gloffset_ClearAccum));
 }
 
-static INLINE void SET_ClearAccum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_ClearAccum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_ClearAccum, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearIndex)(GLfloat);
 #define CALL_ClearIndex(disp, parameters) \
     (* GET_ClearIndex(disp)) parameters
-static INLINE _glptr_ClearIndex GET_ClearIndex(struct _glapi_table *disp) {
+static inline _glptr_ClearIndex GET_ClearIndex(struct _glapi_table *disp) {
    return (_glptr_ClearIndex) (GET_by_offset(disp, _gloffset_ClearIndex));
 }
 
-static INLINE void SET_ClearIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_ClearIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_ClearIndex, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
 #define CALL_ClearColor(disp, parameters) \
     (* GET_ClearColor(disp)) parameters
-static INLINE _glptr_ClearColor GET_ClearColor(struct _glapi_table *disp) {
+static inline _glptr_ClearColor GET_ClearColor(struct _glapi_table *disp) {
    return (_glptr_ClearColor) (GET_by_offset(disp, _gloffset_ClearColor));
 }
 
-static INLINE void SET_ClearColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf, GLclampf, GLclampf)) {
+static inline void SET_ClearColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf, GLclampf, GLclampf)) {
    SET_by_offset(disp, _gloffset_ClearColor, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearStencil)(GLint);
 #define CALL_ClearStencil(disp, parameters) \
     (* GET_ClearStencil(disp)) parameters
-static INLINE _glptr_ClearStencil GET_ClearStencil(struct _glapi_table *disp) {
+static inline _glptr_ClearStencil GET_ClearStencil(struct _glapi_table *disp) {
    return (_glptr_ClearStencil) (GET_by_offset(disp, _gloffset_ClearStencil));
 }
 
-static INLINE void SET_ClearStencil(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
+static inline void SET_ClearStencil(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
    SET_by_offset(disp, _gloffset_ClearStencil, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearDepth)(GLclampd);
 #define CALL_ClearDepth(disp, parameters) \
     (* GET_ClearDepth(disp)) parameters
-static INLINE _glptr_ClearDepth GET_ClearDepth(struct _glapi_table *disp) {
+static inline _glptr_ClearDepth GET_ClearDepth(struct _glapi_table *disp) {
    return (_glptr_ClearDepth) (GET_by_offset(disp, _gloffset_ClearDepth));
 }
 
-static INLINE void SET_ClearDepth(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd)) {
+static inline void SET_ClearDepth(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd)) {
    SET_by_offset(disp, _gloffset_ClearDepth, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilMask)(GLuint);
 #define CALL_StencilMask(disp, parameters) \
     (* GET_StencilMask(disp)) parameters
-static INLINE _glptr_StencilMask GET_StencilMask(struct _glapi_table *disp) {
+static inline _glptr_StencilMask GET_StencilMask(struct _glapi_table *disp) {
    return (_glptr_StencilMask) (GET_by_offset(disp, _gloffset_StencilMask));
 }
 
-static INLINE void SET_StencilMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_StencilMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_StencilMask, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorMask)(GLboolean, GLboolean, GLboolean, GLboolean);
 #define CALL_ColorMask(disp, parameters) \
     (* GET_ColorMask(disp)) parameters
-static INLINE _glptr_ColorMask GET_ColorMask(struct _glapi_table *disp) {
+static inline _glptr_ColorMask GET_ColorMask(struct _glapi_table *disp) {
    return (_glptr_ColorMask) (GET_by_offset(disp, _gloffset_ColorMask));
 }
 
-static INLINE void SET_ColorMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean, GLboolean, GLboolean, GLboolean)) {
+static inline void SET_ColorMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean, GLboolean, GLboolean, GLboolean)) {
    SET_by_offset(disp, _gloffset_ColorMask, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DepthMask)(GLboolean);
 #define CALL_DepthMask(disp, parameters) \
     (* GET_DepthMask(disp)) parameters
-static INLINE _glptr_DepthMask GET_DepthMask(struct _glapi_table *disp) {
+static inline _glptr_DepthMask GET_DepthMask(struct _glapi_table *disp) {
    return (_glptr_DepthMask) (GET_by_offset(disp, _gloffset_DepthMask));
 }
 
-static INLINE void SET_DepthMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean)) {
+static inline void SET_DepthMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean)) {
    SET_by_offset(disp, _gloffset_DepthMask, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_IndexMask)(GLuint);
 #define CALL_IndexMask(disp, parameters) \
     (* GET_IndexMask(disp)) parameters
-static INLINE _glptr_IndexMask GET_IndexMask(struct _glapi_table *disp) {
+static inline _glptr_IndexMask GET_IndexMask(struct _glapi_table *disp) {
    return (_glptr_IndexMask) (GET_by_offset(disp, _gloffset_IndexMask));
 }
 
-static INLINE void SET_IndexMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IndexMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IndexMask, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Accum)(GLenum, GLfloat);
 #define CALL_Accum(disp, parameters) \
     (* GET_Accum(disp)) parameters
-static INLINE _glptr_Accum GET_Accum(struct _glapi_table *disp) {
+static inline _glptr_Accum GET_Accum(struct _glapi_table *disp) {
    return (_glptr_Accum) (GET_by_offset(disp, _gloffset_Accum));
 }
 
-static INLINE void SET_Accum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_Accum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_Accum, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Disable)(GLenum);
 #define CALL_Disable(disp, parameters) \
     (* GET_Disable(disp)) parameters
-static INLINE _glptr_Disable GET_Disable(struct _glapi_table *disp) {
+static inline _glptr_Disable GET_Disable(struct _glapi_table *disp) {
    return (_glptr_Disable) (GET_by_offset(disp, _gloffset_Disable));
 }
 
-static INLINE void SET_Disable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_Disable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_Disable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Enable)(GLenum);
 #define CALL_Enable(disp, parameters) \
     (* GET_Enable(disp)) parameters
-static INLINE _glptr_Enable GET_Enable(struct _glapi_table *disp) {
+static inline _glptr_Enable GET_Enable(struct _glapi_table *disp) {
    return (_glptr_Enable) (GET_by_offset(disp, _gloffset_Enable));
 }
 
-static INLINE void SET_Enable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_Enable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_Enable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Finish)(void);
 #define CALL_Finish(disp, parameters) \
     (* GET_Finish(disp)) parameters
-static INLINE _glptr_Finish GET_Finish(struct _glapi_table *disp) {
+static inline _glptr_Finish GET_Finish(struct _glapi_table *disp) {
    return (_glptr_Finish) (GET_by_offset(disp, _gloffset_Finish));
 }
 
-static INLINE void SET_Finish(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_Finish(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_Finish, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Flush)(void);
 #define CALL_Flush(disp, parameters) \
     (* GET_Flush(disp)) parameters
-static INLINE _glptr_Flush GET_Flush(struct _glapi_table *disp) {
+static inline _glptr_Flush GET_Flush(struct _glapi_table *disp) {
    return (_glptr_Flush) (GET_by_offset(disp, _gloffset_Flush));
 }
 
-static INLINE void SET_Flush(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_Flush(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_Flush, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PopAttrib)(void);
 #define CALL_PopAttrib(disp, parameters) \
     (* GET_PopAttrib(disp)) parameters
-static INLINE _glptr_PopAttrib GET_PopAttrib(struct _glapi_table *disp) {
+static inline _glptr_PopAttrib GET_PopAttrib(struct _glapi_table *disp) {
    return (_glptr_PopAttrib) (GET_by_offset(disp, _gloffset_PopAttrib));
 }
 
-static INLINE void SET_PopAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PopAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PopAttrib, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PushAttrib)(GLbitfield);
 #define CALL_PushAttrib(disp, parameters) \
     (* GET_PushAttrib(disp)) parameters
-static INLINE _glptr_PushAttrib GET_PushAttrib(struct _glapi_table *disp) {
+static inline _glptr_PushAttrib GET_PushAttrib(struct _glapi_table *disp) {
    return (_glptr_PushAttrib) (GET_by_offset(disp, _gloffset_PushAttrib));
 }
 
-static INLINE void SET_PushAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) {
+static inline void SET_PushAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) {
    SET_by_offset(disp, _gloffset_PushAttrib, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Map1d)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
 #define CALL_Map1d(disp, parameters) \
     (* GET_Map1d(disp)) parameters
-static INLINE _glptr_Map1d GET_Map1d(struct _glapi_table *disp) {
+static inline _glptr_Map1d GET_Map1d(struct _glapi_table *disp) {
    return (_glptr_Map1d) (GET_by_offset(disp, _gloffset_Map1d));
 }
 
-static INLINE void SET_Map1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *)) {
+static inline void SET_Map1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Map1d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Map1f)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
 #define CALL_Map1f(disp, parameters) \
     (* GET_Map1f(disp)) parameters
-static INLINE _glptr_Map1f GET_Map1f(struct _glapi_table *disp) {
+static inline _glptr_Map1f GET_Map1f(struct _glapi_table *disp) {
    return (_glptr_Map1f) (GET_by_offset(disp, _gloffset_Map1f));
 }
 
-static INLINE void SET_Map1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *)) {
+static inline void SET_Map1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Map1f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Map2d)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
 #define CALL_Map2d(disp, parameters) \
     (* GET_Map2d(disp)) parameters
-static INLINE _glptr_Map2d GET_Map2d(struct _glapi_table *disp) {
+static inline _glptr_Map2d GET_Map2d(struct _glapi_table *disp) {
    return (_glptr_Map2d) (GET_by_offset(disp, _gloffset_Map2d));
 }
 
-static INLINE void SET_Map2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *)) {
+static inline void SET_Map2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_Map2d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Map2f)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
 #define CALL_Map2f(disp, parameters) \
     (* GET_Map2f(disp)) parameters
-static INLINE _glptr_Map2f GET_Map2f(struct _glapi_table *disp) {
+static inline _glptr_Map2f GET_Map2f(struct _glapi_table *disp) {
    return (_glptr_Map2f) (GET_by_offset(disp, _gloffset_Map2f));
 }
 
-static INLINE void SET_Map2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *)) {
+static inline void SET_Map2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Map2f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MapGrid1d)(GLint, GLdouble, GLdouble);
 #define CALL_MapGrid1d(disp, parameters) \
     (* GET_MapGrid1d(disp)) parameters
-static INLINE _glptr_MapGrid1d GET_MapGrid1d(struct _glapi_table *disp) {
+static inline _glptr_MapGrid1d GET_MapGrid1d(struct _glapi_table *disp) {
    return (_glptr_MapGrid1d) (GET_by_offset(disp, _gloffset_MapGrid1d));
 }
 
-static INLINE void SET_MapGrid1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble)) {
+static inline void SET_MapGrid1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_MapGrid1d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MapGrid1f)(GLint, GLfloat, GLfloat);
 #define CALL_MapGrid1f(disp, parameters) \
     (* GET_MapGrid1f(disp)) parameters
-static INLINE _glptr_MapGrid1f GET_MapGrid1f(struct _glapi_table *disp) {
+static inline _glptr_MapGrid1f GET_MapGrid1f(struct _glapi_table *disp) {
    return (_glptr_MapGrid1f) (GET_by_offset(disp, _gloffset_MapGrid1f));
 }
 
-static INLINE void SET_MapGrid1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) {
+static inline void SET_MapGrid1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_MapGrid1f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MapGrid2d)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble);
 #define CALL_MapGrid2d(disp, parameters) \
     (* GET_MapGrid2d(disp)) parameters
-static INLINE _glptr_MapGrid2d GET_MapGrid2d(struct _glapi_table *disp) {
+static inline _glptr_MapGrid2d GET_MapGrid2d(struct _glapi_table *disp) {
    return (_glptr_MapGrid2d) (GET_by_offset(disp, _gloffset_MapGrid2d));
 }
 
-static INLINE void SET_MapGrid2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble)) {
+static inline void SET_MapGrid2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_MapGrid2d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MapGrid2f)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat);
 #define CALL_MapGrid2f(disp, parameters) \
     (* GET_MapGrid2f(disp)) parameters
-static INLINE _glptr_MapGrid2f GET_MapGrid2f(struct _glapi_table *disp) {
+static inline _glptr_MapGrid2f GET_MapGrid2f(struct _glapi_table *disp) {
    return (_glptr_MapGrid2f) (GET_by_offset(disp, _gloffset_MapGrid2f));
 }
 
-static INLINE void SET_MapGrid2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat)) {
+static inline void SET_MapGrid2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_MapGrid2f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord1d)(GLdouble);
 #define CALL_EvalCoord1d(disp, parameters) \
     (* GET_EvalCoord1d(disp)) parameters
-static INLINE _glptr_EvalCoord1d GET_EvalCoord1d(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord1d GET_EvalCoord1d(struct _glapi_table *disp) {
    return (_glptr_EvalCoord1d) (GET_by_offset(disp, _gloffset_EvalCoord1d));
 }
 
-static INLINE void SET_EvalCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
+static inline void SET_EvalCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
    SET_by_offset(disp, _gloffset_EvalCoord1d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord1dv)(const GLdouble *);
 #define CALL_EvalCoord1dv(disp, parameters) \
     (* GET_EvalCoord1dv(disp)) parameters
-static INLINE _glptr_EvalCoord1dv GET_EvalCoord1dv(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord1dv GET_EvalCoord1dv(struct _glapi_table *disp) {
    return (_glptr_EvalCoord1dv) (GET_by_offset(disp, _gloffset_EvalCoord1dv));
 }
 
-static INLINE void SET_EvalCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_EvalCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_EvalCoord1dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord1f)(GLfloat);
 #define CALL_EvalCoord1f(disp, parameters) \
     (* GET_EvalCoord1f(disp)) parameters
-static INLINE _glptr_EvalCoord1f GET_EvalCoord1f(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord1f GET_EvalCoord1f(struct _glapi_table *disp) {
    return (_glptr_EvalCoord1f) (GET_by_offset(disp, _gloffset_EvalCoord1f));
 }
 
-static INLINE void SET_EvalCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_EvalCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_EvalCoord1f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord1fv)(const GLfloat *);
 #define CALL_EvalCoord1fv(disp, parameters) \
     (* GET_EvalCoord1fv(disp)) parameters
-static INLINE _glptr_EvalCoord1fv GET_EvalCoord1fv(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord1fv GET_EvalCoord1fv(struct _glapi_table *disp) {
    return (_glptr_EvalCoord1fv) (GET_by_offset(disp, _gloffset_EvalCoord1fv));
 }
 
-static INLINE void SET_EvalCoord1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_EvalCoord1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_EvalCoord1fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord2d)(GLdouble, GLdouble);
 #define CALL_EvalCoord2d(disp, parameters) \
     (* GET_EvalCoord2d(disp)) parameters
-static INLINE _glptr_EvalCoord2d GET_EvalCoord2d(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord2d GET_EvalCoord2d(struct _glapi_table *disp) {
    return (_glptr_EvalCoord2d) (GET_by_offset(disp, _gloffset_EvalCoord2d));
 }
 
-static INLINE void SET_EvalCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
+static inline void SET_EvalCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_EvalCoord2d, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord2dv)(const GLdouble *);
 #define CALL_EvalCoord2dv(disp, parameters) \
     (* GET_EvalCoord2dv(disp)) parameters
-static INLINE _glptr_EvalCoord2dv GET_EvalCoord2dv(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord2dv GET_EvalCoord2dv(struct _glapi_table *disp) {
    return (_glptr_EvalCoord2dv) (GET_by_offset(disp, _gloffset_EvalCoord2dv));
 }
 
-static INLINE void SET_EvalCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_EvalCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_EvalCoord2dv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord2f)(GLfloat, GLfloat);
 #define CALL_EvalCoord2f(disp, parameters) \
     (* GET_EvalCoord2f(disp)) parameters
-static INLINE _glptr_EvalCoord2f GET_EvalCoord2f(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord2f GET_EvalCoord2f(struct _glapi_table *disp) {
    return (_glptr_EvalCoord2f) (GET_by_offset(disp, _gloffset_EvalCoord2f));
 }
 
-static INLINE void SET_EvalCoord2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_EvalCoord2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_EvalCoord2f, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalCoord2fv)(const GLfloat *);
 #define CALL_EvalCoord2fv(disp, parameters) \
     (* GET_EvalCoord2fv(disp)) parameters
-static INLINE _glptr_EvalCoord2fv GET_EvalCoord2fv(struct _glapi_table *disp) {
+static inline _glptr_EvalCoord2fv GET_EvalCoord2fv(struct _glapi_table *disp) {
    return (_glptr_EvalCoord2fv) (GET_by_offset(disp, _gloffset_EvalCoord2fv));
 }
 
-static INLINE void SET_EvalCoord2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_EvalCoord2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_EvalCoord2fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalMesh1)(GLenum, GLint, GLint);
 #define CALL_EvalMesh1(disp, parameters) \
     (* GET_EvalMesh1(disp)) parameters
-static INLINE _glptr_EvalMesh1 GET_EvalMesh1(struct _glapi_table *disp) {
+static inline _glptr_EvalMesh1 GET_EvalMesh1(struct _glapi_table *disp) {
    return (_glptr_EvalMesh1) (GET_by_offset(disp, _gloffset_EvalMesh1));
 }
 
-static INLINE void SET_EvalMesh1(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) {
+static inline void SET_EvalMesh1(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_EvalMesh1, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalPoint1)(GLint);
 #define CALL_EvalPoint1(disp, parameters) \
     (* GET_EvalPoint1(disp)) parameters
-static INLINE _glptr_EvalPoint1 GET_EvalPoint1(struct _glapi_table *disp) {
+static inline _glptr_EvalPoint1 GET_EvalPoint1(struct _glapi_table *disp) {
    return (_glptr_EvalPoint1) (GET_by_offset(disp, _gloffset_EvalPoint1));
 }
 
-static INLINE void SET_EvalPoint1(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
+static inline void SET_EvalPoint1(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
    SET_by_offset(disp, _gloffset_EvalPoint1, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalMesh2)(GLenum, GLint, GLint, GLint, GLint);
 #define CALL_EvalMesh2(disp, parameters) \
     (* GET_EvalMesh2(disp)) parameters
-static INLINE _glptr_EvalMesh2 GET_EvalMesh2(struct _glapi_table *disp) {
+static inline _glptr_EvalMesh2 GET_EvalMesh2(struct _glapi_table *disp) {
    return (_glptr_EvalMesh2) (GET_by_offset(disp, _gloffset_EvalMesh2));
 }
 
-static INLINE void SET_EvalMesh2(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) {
+static inline void SET_EvalMesh2(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_EvalMesh2, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EvalPoint2)(GLint, GLint);
 #define CALL_EvalPoint2(disp, parameters) \
     (* GET_EvalPoint2(disp)) parameters
-static INLINE _glptr_EvalPoint2 GET_EvalPoint2(struct _glapi_table *disp) {
+static inline _glptr_EvalPoint2 GET_EvalPoint2(struct _glapi_table *disp) {
    return (_glptr_EvalPoint2) (GET_by_offset(disp, _gloffset_EvalPoint2));
 }
 
-static INLINE void SET_EvalPoint2(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+static inline void SET_EvalPoint2(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
    SET_by_offset(disp, _gloffset_EvalPoint2, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_AlphaFunc)(GLenum, GLclampf);
 #define CALL_AlphaFunc(disp, parameters) \
     (* GET_AlphaFunc(disp)) parameters
-static INLINE _glptr_AlphaFunc GET_AlphaFunc(struct _glapi_table *disp) {
+static inline _glptr_AlphaFunc GET_AlphaFunc(struct _glapi_table *disp) {
    return (_glptr_AlphaFunc) (GET_by_offset(disp, _gloffset_AlphaFunc));
 }
 
-static INLINE void SET_AlphaFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLclampf)) {
+static inline void SET_AlphaFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLclampf)) {
    SET_by_offset(disp, _gloffset_AlphaFunc, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendFunc)(GLenum, GLenum);
 #define CALL_BlendFunc(disp, parameters) \
     (* GET_BlendFunc(disp)) parameters
-static INLINE _glptr_BlendFunc GET_BlendFunc(struct _glapi_table *disp) {
+static inline _glptr_BlendFunc GET_BlendFunc(struct _glapi_table *disp) {
    return (_glptr_BlendFunc) (GET_by_offset(disp, _gloffset_BlendFunc));
 }
 
-static INLINE void SET_BlendFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_BlendFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendFunc, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LogicOp)(GLenum);
 #define CALL_LogicOp(disp, parameters) \
     (* GET_LogicOp(disp)) parameters
-static INLINE _glptr_LogicOp GET_LogicOp(struct _glapi_table *disp) {
+static inline _glptr_LogicOp GET_LogicOp(struct _glapi_table *disp) {
    return (_glptr_LogicOp) (GET_by_offset(disp, _gloffset_LogicOp));
 }
 
-static INLINE void SET_LogicOp(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_LogicOp(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_LogicOp, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilFunc)(GLenum, GLint, GLuint);
 #define CALL_StencilFunc(disp, parameters) \
     (* GET_StencilFunc(disp)) parameters
-static INLINE _glptr_StencilFunc GET_StencilFunc(struct _glapi_table *disp) {
+static inline _glptr_StencilFunc GET_StencilFunc(struct _glapi_table *disp) {
    return (_glptr_StencilFunc) (GET_by_offset(disp, _gloffset_StencilFunc));
 }
 
-static INLINE void SET_StencilFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLuint)) {
+static inline void SET_StencilFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLuint)) {
    SET_by_offset(disp, _gloffset_StencilFunc, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilOp)(GLenum, GLenum, GLenum);
 #define CALL_StencilOp(disp, parameters) \
     (* GET_StencilOp(disp)) parameters
-static INLINE _glptr_StencilOp GET_StencilOp(struct _glapi_table *disp) {
+static inline _glptr_StencilOp GET_StencilOp(struct _glapi_table *disp) {
    return (_glptr_StencilOp) (GET_by_offset(disp, _gloffset_StencilOp));
 }
 
-static INLINE void SET_StencilOp(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum)) {
+static inline void SET_StencilOp(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_StencilOp, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DepthFunc)(GLenum);
 #define CALL_DepthFunc(disp, parameters) \
     (* GET_DepthFunc(disp)) parameters
-static INLINE _glptr_DepthFunc GET_DepthFunc(struct _glapi_table *disp) {
+static inline _glptr_DepthFunc GET_DepthFunc(struct _glapi_table *disp) {
    return (_glptr_DepthFunc) (GET_by_offset(disp, _gloffset_DepthFunc));
 }
 
-static INLINE void SET_DepthFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_DepthFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_DepthFunc, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelZoom)(GLfloat, GLfloat);
 #define CALL_PixelZoom(disp, parameters) \
     (* GET_PixelZoom(disp)) parameters
-static INLINE _glptr_PixelZoom GET_PixelZoom(struct _glapi_table *disp) {
+static inline _glptr_PixelZoom GET_PixelZoom(struct _glapi_table *disp) {
    return (_glptr_PixelZoom) (GET_by_offset(disp, _gloffset_PixelZoom));
 }
 
-static INLINE void SET_PixelZoom(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_PixelZoom(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_PixelZoom, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTransferf)(GLenum, GLfloat);
 #define CALL_PixelTransferf(disp, parameters) \
     (* GET_PixelTransferf(disp)) parameters
-static INLINE _glptr_PixelTransferf GET_PixelTransferf(struct _glapi_table *disp) {
+static inline _glptr_PixelTransferf GET_PixelTransferf(struct _glapi_table *disp) {
    return (_glptr_PixelTransferf) (GET_by_offset(disp, _gloffset_PixelTransferf));
 }
 
-static INLINE void SET_PixelTransferf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_PixelTransferf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_PixelTransferf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTransferi)(GLenum, GLint);
 #define CALL_PixelTransferi(disp, parameters) \
     (* GET_PixelTransferi(disp)) parameters
-static INLINE _glptr_PixelTransferi GET_PixelTransferi(struct _glapi_table *disp) {
+static inline _glptr_PixelTransferi GET_PixelTransferi(struct _glapi_table *disp) {
    return (_glptr_PixelTransferi) (GET_by_offset(disp, _gloffset_PixelTransferi));
 }
 
-static INLINE void SET_PixelTransferi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_PixelTransferi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_PixelTransferi, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelStoref)(GLenum, GLfloat);
 #define CALL_PixelStoref(disp, parameters) \
     (* GET_PixelStoref(disp)) parameters
-static INLINE _glptr_PixelStoref GET_PixelStoref(struct _glapi_table *disp) {
+static inline _glptr_PixelStoref GET_PixelStoref(struct _glapi_table *disp) {
    return (_glptr_PixelStoref) (GET_by_offset(disp, _gloffset_PixelStoref));
 }
 
-static INLINE void SET_PixelStoref(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_PixelStoref(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_PixelStoref, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelStorei)(GLenum, GLint);
 #define CALL_PixelStorei(disp, parameters) \
     (* GET_PixelStorei(disp)) parameters
-static INLINE _glptr_PixelStorei GET_PixelStorei(struct _glapi_table *disp) {
+static inline _glptr_PixelStorei GET_PixelStorei(struct _glapi_table *disp) {
    return (_glptr_PixelStorei) (GET_by_offset(disp, _gloffset_PixelStorei));
 }
 
-static INLINE void SET_PixelStorei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_PixelStorei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_PixelStorei, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelMapfv)(GLenum, GLsizei, const GLfloat *);
 #define CALL_PixelMapfv(disp, parameters) \
     (* GET_PixelMapfv(disp)) parameters
-static INLINE _glptr_PixelMapfv GET_PixelMapfv(struct _glapi_table *disp) {
+static inline _glptr_PixelMapfv GET_PixelMapfv(struct _glapi_table *disp) {
    return (_glptr_PixelMapfv) (GET_by_offset(disp, _gloffset_PixelMapfv));
 }
 
-static INLINE void SET_PixelMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLfloat *)) {
+static inline void SET_PixelMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_PixelMapfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelMapuiv)(GLenum, GLsizei, const GLuint *);
 #define CALL_PixelMapuiv(disp, parameters) \
     (* GET_PixelMapuiv(disp)) parameters
-static INLINE _glptr_PixelMapuiv GET_PixelMapuiv(struct _glapi_table *disp) {
+static inline _glptr_PixelMapuiv GET_PixelMapuiv(struct _glapi_table *disp) {
    return (_glptr_PixelMapuiv) (GET_by_offset(disp, _gloffset_PixelMapuiv));
 }
 
-static INLINE void SET_PixelMapuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLuint *)) {
+static inline void SET_PixelMapuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_PixelMapuiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelMapusv)(GLenum, GLsizei, const GLushort *);
 #define CALL_PixelMapusv(disp, parameters) \
     (* GET_PixelMapusv(disp)) parameters
-static INLINE _glptr_PixelMapusv GET_PixelMapusv(struct _glapi_table *disp) {
+static inline _glptr_PixelMapusv GET_PixelMapusv(struct _glapi_table *disp) {
    return (_glptr_PixelMapusv) (GET_by_offset(disp, _gloffset_PixelMapusv));
 }
 
-static INLINE void SET_PixelMapusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLushort *)) {
+static inline void SET_PixelMapusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLushort *)) {
    SET_by_offset(disp, _gloffset_PixelMapusv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ReadBuffer)(GLenum);
 #define CALL_ReadBuffer(disp, parameters) \
     (* GET_ReadBuffer(disp)) parameters
-static INLINE _glptr_ReadBuffer GET_ReadBuffer(struct _glapi_table *disp) {
+static inline _glptr_ReadBuffer GET_ReadBuffer(struct _glapi_table *disp) {
    return (_glptr_ReadBuffer) (GET_by_offset(disp, _gloffset_ReadBuffer));
 }
 
-static INLINE void SET_ReadBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ReadBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ReadBuffer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyPixels)(GLint, GLint, GLsizei, GLsizei, GLenum);
 #define CALL_CopyPixels(disp, parameters) \
     (* GET_CopyPixels(disp)) parameters
-static INLINE _glptr_CopyPixels GET_CopyPixels(struct _glapi_table *disp) {
+static inline _glptr_CopyPixels GET_CopyPixels(struct _glapi_table *disp) {
    return (_glptr_CopyPixels) (GET_by_offset(disp, _gloffset_CopyPixels));
 }
 
-static INLINE void SET_CopyPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum)) {
+static inline void SET_CopyPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum)) {
    SET_by_offset(disp, _gloffset_CopyPixels, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ReadPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
 #define CALL_ReadPixels(disp, parameters) \
     (* GET_ReadPixels(disp)) parameters
-static INLINE _glptr_ReadPixels GET_ReadPixels(struct _glapi_table *disp) {
+static inline _glptr_ReadPixels GET_ReadPixels(struct _glapi_table *disp) {
    return (_glptr_ReadPixels) (GET_by_offset(disp, _gloffset_ReadPixels));
 }
 
-static INLINE void SET_ReadPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *)) {
+static inline void SET_ReadPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_ReadPixels, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawPixels)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_DrawPixels(disp, parameters) \
     (* GET_DrawPixels(disp)) parameters
-static INLINE _glptr_DrawPixels GET_DrawPixels(struct _glapi_table *disp) {
+static inline _glptr_DrawPixels GET_DrawPixels(struct _glapi_table *disp) {
    return (_glptr_DrawPixels) (GET_by_offset(disp, _gloffset_DrawPixels));
 }
 
-static INLINE void SET_DrawPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_DrawPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_DrawPixels, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetBooleanv)(GLenum, GLboolean *);
 #define CALL_GetBooleanv(disp, parameters) \
     (* GET_GetBooleanv(disp)) parameters
-static INLINE _glptr_GetBooleanv GET_GetBooleanv(struct _glapi_table *disp) {
+static inline _glptr_GetBooleanv GET_GetBooleanv(struct _glapi_table *disp) {
    return (_glptr_GetBooleanv) (GET_by_offset(disp, _gloffset_GetBooleanv));
 }
 
-static INLINE void SET_GetBooleanv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean *)) {
+static inline void SET_GetBooleanv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean *)) {
    SET_by_offset(disp, _gloffset_GetBooleanv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetClipPlane)(GLenum, GLdouble *);
 #define CALL_GetClipPlane(disp, parameters) \
     (* GET_GetClipPlane(disp)) parameters
-static INLINE _glptr_GetClipPlane GET_GetClipPlane(struct _glapi_table *disp) {
+static inline _glptr_GetClipPlane GET_GetClipPlane(struct _glapi_table *disp) {
    return (_glptr_GetClipPlane) (GET_by_offset(disp, _gloffset_GetClipPlane));
 }
 
-static INLINE void SET_GetClipPlane(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble *)) {
+static inline void SET_GetClipPlane(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetClipPlane, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetDoublev)(GLenum, GLdouble *);
 #define CALL_GetDoublev(disp, parameters) \
     (* GET_GetDoublev(disp)) parameters
-static INLINE _glptr_GetDoublev GET_GetDoublev(struct _glapi_table *disp) {
+static inline _glptr_GetDoublev GET_GetDoublev(struct _glapi_table *disp) {
    return (_glptr_GetDoublev) (GET_by_offset(disp, _gloffset_GetDoublev));
 }
 
-static INLINE void SET_GetDoublev(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble *)) {
+static inline void SET_GetDoublev(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetDoublev, fn);
 }
 
 typedef GLenum (GLAPIENTRYP _glptr_GetError)(void);
 #define CALL_GetError(disp, parameters) \
     (* GET_GetError(disp)) parameters
-static INLINE _glptr_GetError GET_GetError(struct _glapi_table *disp) {
+static inline _glptr_GetError GET_GetError(struct _glapi_table *disp) {
    return (_glptr_GetError) (GET_by_offset(disp, _gloffset_GetError));
 }
 
-static INLINE void SET_GetError(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(void)) {
+static inline void SET_GetError(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_GetError, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetFloatv)(GLenum, GLfloat *);
 #define CALL_GetFloatv(disp, parameters) \
     (* GET_GetFloatv(disp)) parameters
-static INLINE _glptr_GetFloatv GET_GetFloatv(struct _glapi_table *disp) {
+static inline _glptr_GetFloatv GET_GetFloatv(struct _glapi_table *disp) {
    return (_glptr_GetFloatv) (GET_by_offset(disp, _gloffset_GetFloatv));
 }
 
-static INLINE void SET_GetFloatv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
+static inline void SET_GetFloatv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetFloatv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetIntegerv)(GLenum, GLint *);
 #define CALL_GetIntegerv(disp, parameters) \
     (* GET_GetIntegerv(disp)) parameters
-static INLINE _glptr_GetIntegerv GET_GetIntegerv(struct _glapi_table *disp) {
+static inline _glptr_GetIntegerv GET_GetIntegerv(struct _glapi_table *disp) {
    return (_glptr_GetIntegerv) (GET_by_offset(disp, _gloffset_GetIntegerv));
 }
 
-static INLINE void SET_GetIntegerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) {
+static inline void SET_GetIntegerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetIntegerv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetLightfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetLightfv(disp, parameters) \
     (* GET_GetLightfv(disp)) parameters
-static INLINE _glptr_GetLightfv GET_GetLightfv(struct _glapi_table *disp) {
+static inline _glptr_GetLightfv GET_GetLightfv(struct _glapi_table *disp) {
    return (_glptr_GetLightfv) (GET_by_offset(disp, _gloffset_GetLightfv));
 }
 
-static INLINE void SET_GetLightfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetLightfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetLightfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetLightiv)(GLenum, GLenum, GLint *);
 #define CALL_GetLightiv(disp, parameters) \
     (* GET_GetLightiv(disp)) parameters
-static INLINE _glptr_GetLightiv GET_GetLightiv(struct _glapi_table *disp) {
+static inline _glptr_GetLightiv GET_GetLightiv(struct _glapi_table *disp) {
    return (_glptr_GetLightiv) (GET_by_offset(disp, _gloffset_GetLightiv));
 }
 
-static INLINE void SET_GetLightiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetLightiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetLightiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMapdv)(GLenum, GLenum, GLdouble *);
 #define CALL_GetMapdv(disp, parameters) \
     (* GET_GetMapdv(disp)) parameters
-static INLINE _glptr_GetMapdv GET_GetMapdv(struct _glapi_table *disp) {
+static inline _glptr_GetMapdv GET_GetMapdv(struct _glapi_table *disp) {
    return (_glptr_GetMapdv) (GET_by_offset(disp, _gloffset_GetMapdv));
 }
 
-static INLINE void SET_GetMapdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble *)) {
+static inline void SET_GetMapdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetMapdv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMapfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetMapfv(disp, parameters) \
     (* GET_GetMapfv(disp)) parameters
-static INLINE _glptr_GetMapfv GET_GetMapfv(struct _glapi_table *disp) {
+static inline _glptr_GetMapfv GET_GetMapfv(struct _glapi_table *disp) {
    return (_glptr_GetMapfv) (GET_by_offset(disp, _gloffset_GetMapfv));
 }
 
-static INLINE void SET_GetMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetMapfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMapiv)(GLenum, GLenum, GLint *);
 #define CALL_GetMapiv(disp, parameters) \
     (* GET_GetMapiv(disp)) parameters
-static INLINE _glptr_GetMapiv GET_GetMapiv(struct _glapi_table *disp) {
+static inline _glptr_GetMapiv GET_GetMapiv(struct _glapi_table *disp) {
    return (_glptr_GetMapiv) (GET_by_offset(disp, _gloffset_GetMapiv));
 }
 
-static INLINE void SET_GetMapiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetMapiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetMapiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMaterialfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetMaterialfv(disp, parameters) \
     (* GET_GetMaterialfv(disp)) parameters
-static INLINE _glptr_GetMaterialfv GET_GetMaterialfv(struct _glapi_table *disp) {
+static inline _glptr_GetMaterialfv GET_GetMaterialfv(struct _glapi_table *disp) {
    return (_glptr_GetMaterialfv) (GET_by_offset(disp, _gloffset_GetMaterialfv));
 }
 
-static INLINE void SET_GetMaterialfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetMaterialfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetMaterialfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMaterialiv)(GLenum, GLenum, GLint *);
 #define CALL_GetMaterialiv(disp, parameters) \
     (* GET_GetMaterialiv(disp)) parameters
-static INLINE _glptr_GetMaterialiv GET_GetMaterialiv(struct _glapi_table *disp) {
+static inline _glptr_GetMaterialiv GET_GetMaterialiv(struct _glapi_table *disp) {
    return (_glptr_GetMaterialiv) (GET_by_offset(disp, _gloffset_GetMaterialiv));
 }
 
-static INLINE void SET_GetMaterialiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetMaterialiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetMaterialiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPixelMapfv)(GLenum, GLfloat *);
 #define CALL_GetPixelMapfv(disp, parameters) \
     (* GET_GetPixelMapfv(disp)) parameters
-static INLINE _glptr_GetPixelMapfv GET_GetPixelMapfv(struct _glapi_table *disp) {
+static inline _glptr_GetPixelMapfv GET_GetPixelMapfv(struct _glapi_table *disp) {
    return (_glptr_GetPixelMapfv) (GET_by_offset(disp, _gloffset_GetPixelMapfv));
 }
 
-static INLINE void SET_GetPixelMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
+static inline void SET_GetPixelMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetPixelMapfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPixelMapuiv)(GLenum, GLuint *);
 #define CALL_GetPixelMapuiv(disp, parameters) \
     (* GET_GetPixelMapuiv(disp)) parameters
-static INLINE _glptr_GetPixelMapuiv GET_GetPixelMapuiv(struct _glapi_table *disp) {
+static inline _glptr_GetPixelMapuiv GET_GetPixelMapuiv(struct _glapi_table *disp) {
    return (_glptr_GetPixelMapuiv) (GET_by_offset(disp, _gloffset_GetPixelMapuiv));
 }
 
-static INLINE void SET_GetPixelMapuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint *)) {
+static inline void SET_GetPixelMapuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetPixelMapuiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPixelMapusv)(GLenum, GLushort *);
 #define CALL_GetPixelMapusv(disp, parameters) \
     (* GET_GetPixelMapusv(disp)) parameters
-static INLINE _glptr_GetPixelMapusv GET_GetPixelMapusv(struct _glapi_table *disp) {
+static inline _glptr_GetPixelMapusv GET_GetPixelMapusv(struct _glapi_table *disp) {
    return (_glptr_GetPixelMapusv) (GET_by_offset(disp, _gloffset_GetPixelMapusv));
 }
 
-static INLINE void SET_GetPixelMapusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLushort *)) {
+static inline void SET_GetPixelMapusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLushort *)) {
    SET_by_offset(disp, _gloffset_GetPixelMapusv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPolygonStipple)(GLubyte *);
 #define CALL_GetPolygonStipple(disp, parameters) \
     (* GET_GetPolygonStipple(disp)) parameters
-static INLINE _glptr_GetPolygonStipple GET_GetPolygonStipple(struct _glapi_table *disp) {
+static inline _glptr_GetPolygonStipple GET_GetPolygonStipple(struct _glapi_table *disp) {
    return (_glptr_GetPolygonStipple) (GET_by_offset(disp, _gloffset_GetPolygonStipple));
 }
 
-static INLINE void SET_GetPolygonStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte *)) {
+static inline void SET_GetPolygonStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte *)) {
    SET_by_offset(disp, _gloffset_GetPolygonStipple, fn);
 }
 
 typedef const GLubyte * (GLAPIENTRYP _glptr_GetString)(GLenum);
 #define CALL_GetString(disp, parameters) \
     (* GET_GetString(disp)) parameters
-static INLINE _glptr_GetString GET_GetString(struct _glapi_table *disp) {
+static inline _glptr_GetString GET_GetString(struct _glapi_table *disp) {
    return (_glptr_GetString) (GET_by_offset(disp, _gloffset_GetString));
 }
 
-static INLINE void SET_GetString(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_GetString(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_GetString, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexEnvfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetTexEnvfv(disp, parameters) \
     (* GET_GetTexEnvfv(disp)) parameters
-static INLINE _glptr_GetTexEnvfv GET_GetTexEnvfv(struct _glapi_table *disp) {
+static inline _glptr_GetTexEnvfv GET_GetTexEnvfv(struct _glapi_table *disp) {
    return (_glptr_GetTexEnvfv) (GET_by_offset(disp, _gloffset_GetTexEnvfv));
 }
 
-static INLINE void SET_GetTexEnvfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetTexEnvfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetTexEnvfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexEnviv)(GLenum, GLenum, GLint *);
 #define CALL_GetTexEnviv(disp, parameters) \
     (* GET_GetTexEnviv(disp)) parameters
-static INLINE _glptr_GetTexEnviv GET_GetTexEnviv(struct _glapi_table *disp) {
+static inline _glptr_GetTexEnviv GET_GetTexEnviv(struct _glapi_table *disp) {
    return (_glptr_GetTexEnviv) (GET_by_offset(disp, _gloffset_GetTexEnviv));
 }
 
-static INLINE void SET_GetTexEnviv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetTexEnviv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTexEnviv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexGendv)(GLenum, GLenum, GLdouble *);
 #define CALL_GetTexGendv(disp, parameters) \
     (* GET_GetTexGendv(disp)) parameters
-static INLINE _glptr_GetTexGendv GET_GetTexGendv(struct _glapi_table *disp) {
+static inline _glptr_GetTexGendv GET_GetTexGendv(struct _glapi_table *disp) {
    return (_glptr_GetTexGendv) (GET_by_offset(disp, _gloffset_GetTexGendv));
 }
 
-static INLINE void SET_GetTexGendv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble *)) {
+static inline void SET_GetTexGendv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetTexGendv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexGenfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetTexGenfv(disp, parameters) \
     (* GET_GetTexGenfv(disp)) parameters
-static INLINE _glptr_GetTexGenfv GET_GetTexGenfv(struct _glapi_table *disp) {
+static inline _glptr_GetTexGenfv GET_GetTexGenfv(struct _glapi_table *disp) {
    return (_glptr_GetTexGenfv) (GET_by_offset(disp, _gloffset_GetTexGenfv));
 }
 
-static INLINE void SET_GetTexGenfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetTexGenfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetTexGenfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexGeniv)(GLenum, GLenum, GLint *);
 #define CALL_GetTexGeniv(disp, parameters) \
     (* GET_GetTexGeniv(disp)) parameters
-static INLINE _glptr_GetTexGeniv GET_GetTexGeniv(struct _glapi_table *disp) {
+static inline _glptr_GetTexGeniv GET_GetTexGeniv(struct _glapi_table *disp) {
    return (_glptr_GetTexGeniv) (GET_by_offset(disp, _gloffset_GetTexGeniv));
 }
 
-static INLINE void SET_GetTexGeniv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetTexGeniv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTexGeniv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexImage)(GLenum, GLint, GLenum, GLenum, GLvoid *);
 #define CALL_GetTexImage(disp, parameters) \
     (* GET_GetTexImage(disp)) parameters
-static INLINE _glptr_GetTexImage GET_GetTexImage(struct _glapi_table *disp) {
+static inline _glptr_GetTexImage GET_GetTexImage(struct _glapi_table *disp) {
    return (_glptr_GetTexImage) (GET_by_offset(disp, _gloffset_GetTexImage));
 }
 
-static INLINE void SET_GetTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLenum, GLvoid *)) {
+static inline void SET_GetTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetTexImage, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetTexParameterfv(disp, parameters) \
     (* GET_GetTexParameterfv(disp)) parameters
-static INLINE _glptr_GetTexParameterfv GET_GetTexParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetTexParameterfv GET_GetTexParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetTexParameterfv) (GET_by_offset(disp, _gloffset_GetTexParameterfv));
 }
 
-static INLINE void SET_GetTexParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetTexParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetTexParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetTexParameteriv(disp, parameters) \
     (* GET_GetTexParameteriv(disp)) parameters
-static INLINE _glptr_GetTexParameteriv GET_GetTexParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetTexParameteriv GET_GetTexParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetTexParameteriv) (GET_by_offset(disp, _gloffset_GetTexParameteriv));
 }
 
-static INLINE void SET_GetTexParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetTexParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTexParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexLevelParameterfv)(GLenum, GLint, GLenum, GLfloat *);
 #define CALL_GetTexLevelParameterfv(disp, parameters) \
     (* GET_GetTexLevelParameterfv(disp)) parameters
-static INLINE _glptr_GetTexLevelParameterfv GET_GetTexLevelParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetTexLevelParameterfv GET_GetTexLevelParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetTexLevelParameterfv) (GET_by_offset(disp, _gloffset_GetTexLevelParameterfv));
 }
 
-static INLINE void SET_GetTexLevelParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLfloat *)) {
+static inline void SET_GetTexLevelParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetTexLevelParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexLevelParameteriv)(GLenum, GLint, GLenum, GLint *);
 #define CALL_GetTexLevelParameteriv(disp, parameters) \
     (* GET_GetTexLevelParameteriv(disp)) parameters
-static INLINE _glptr_GetTexLevelParameteriv GET_GetTexLevelParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetTexLevelParameteriv GET_GetTexLevelParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetTexLevelParameteriv) (GET_by_offset(disp, _gloffset_GetTexLevelParameteriv));
 }
 
-static INLINE void SET_GetTexLevelParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint *)) {
+static inline void SET_GetTexLevelParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTexLevelParameteriv, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsEnabled)(GLenum);
 #define CALL_IsEnabled(disp, parameters) \
     (* GET_IsEnabled(disp)) parameters
-static INLINE _glptr_IsEnabled GET_IsEnabled(struct _glapi_table *disp) {
+static inline _glptr_IsEnabled GET_IsEnabled(struct _glapi_table *disp) {
    return (_glptr_IsEnabled) (GET_by_offset(disp, _gloffset_IsEnabled));
 }
 
-static INLINE void SET_IsEnabled(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_IsEnabled(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_IsEnabled, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsList)(GLuint);
 #define CALL_IsList(disp, parameters) \
     (* GET_IsList(disp)) parameters
-static INLINE _glptr_IsList GET_IsList(struct _glapi_table *disp) {
+static inline _glptr_IsList GET_IsList(struct _glapi_table *disp) {
    return (_glptr_IsList) (GET_by_offset(disp, _gloffset_IsList));
 }
 
-static INLINE void SET_IsList(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsList(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsList, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DepthRange)(GLclampd, GLclampd);
 #define CALL_DepthRange(disp, parameters) \
     (* GET_DepthRange(disp)) parameters
-static INLINE _glptr_DepthRange GET_DepthRange(struct _glapi_table *disp) {
+static inline _glptr_DepthRange GET_DepthRange(struct _glapi_table *disp) {
    return (_glptr_DepthRange) (GET_by_offset(disp, _gloffset_DepthRange));
 }
 
-static INLINE void SET_DepthRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) {
+static inline void SET_DepthRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) {
    SET_by_offset(disp, _gloffset_DepthRange, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Frustum)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Frustum(disp, parameters) \
     (* GET_Frustum(disp)) parameters
-static INLINE _glptr_Frustum GET_Frustum(struct _glapi_table *disp) {
+static inline _glptr_Frustum GET_Frustum(struct _glapi_table *disp) {
    return (_glptr_Frustum) (GET_by_offset(disp, _gloffset_Frustum));
 }
 
-static INLINE void SET_Frustum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Frustum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Frustum, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadIdentity)(void);
 #define CALL_LoadIdentity(disp, parameters) \
     (* GET_LoadIdentity(disp)) parameters
-static INLINE _glptr_LoadIdentity GET_LoadIdentity(struct _glapi_table *disp) {
+static inline _glptr_LoadIdentity GET_LoadIdentity(struct _glapi_table *disp) {
    return (_glptr_LoadIdentity) (GET_by_offset(disp, _gloffset_LoadIdentity));
 }
 
-static INLINE void SET_LoadIdentity(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_LoadIdentity(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_LoadIdentity, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadMatrixf)(const GLfloat *);
 #define CALL_LoadMatrixf(disp, parameters) \
     (* GET_LoadMatrixf(disp)) parameters
-static INLINE _glptr_LoadMatrixf GET_LoadMatrixf(struct _glapi_table *disp) {
+static inline _glptr_LoadMatrixf GET_LoadMatrixf(struct _glapi_table *disp) {
    return (_glptr_LoadMatrixf) (GET_by_offset(disp, _gloffset_LoadMatrixf));
 }
 
-static INLINE void SET_LoadMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_LoadMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_LoadMatrixf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadMatrixd)(const GLdouble *);
 #define CALL_LoadMatrixd(disp, parameters) \
     (* GET_LoadMatrixd(disp)) parameters
-static INLINE _glptr_LoadMatrixd GET_LoadMatrixd(struct _glapi_table *disp) {
+static inline _glptr_LoadMatrixd GET_LoadMatrixd(struct _glapi_table *disp) {
    return (_glptr_LoadMatrixd) (GET_by_offset(disp, _gloffset_LoadMatrixd));
 }
 
-static INLINE void SET_LoadMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_LoadMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_LoadMatrixd, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MatrixMode)(GLenum);
 #define CALL_MatrixMode(disp, parameters) \
     (* GET_MatrixMode(disp)) parameters
-static INLINE _glptr_MatrixMode GET_MatrixMode(struct _glapi_table *disp) {
+static inline _glptr_MatrixMode GET_MatrixMode(struct _glapi_table *disp) {
    return (_glptr_MatrixMode) (GET_by_offset(disp, _gloffset_MatrixMode));
 }
 
-static INLINE void SET_MatrixMode(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_MatrixMode(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_MatrixMode, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultMatrixf)(const GLfloat *);
 #define CALL_MultMatrixf(disp, parameters) \
     (* GET_MultMatrixf(disp)) parameters
-static INLINE _glptr_MultMatrixf GET_MultMatrixf(struct _glapi_table *disp) {
+static inline _glptr_MultMatrixf GET_MultMatrixf(struct _glapi_table *disp) {
    return (_glptr_MultMatrixf) (GET_by_offset(disp, _gloffset_MultMatrixf));
 }
 
-static INLINE void SET_MultMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_MultMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_MultMatrixf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultMatrixd)(const GLdouble *);
 #define CALL_MultMatrixd(disp, parameters) \
     (* GET_MultMatrixd(disp)) parameters
-static INLINE _glptr_MultMatrixd GET_MultMatrixd(struct _glapi_table *disp) {
+static inline _glptr_MultMatrixd GET_MultMatrixd(struct _glapi_table *disp) {
    return (_glptr_MultMatrixd) (GET_by_offset(disp, _gloffset_MultMatrixd));
 }
 
-static INLINE void SET_MultMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_MultMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_MultMatrixd, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Ortho)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Ortho(disp, parameters) \
     (* GET_Ortho(disp)) parameters
-static INLINE _glptr_Ortho GET_Ortho(struct _glapi_table *disp) {
+static inline _glptr_Ortho GET_Ortho(struct _glapi_table *disp) {
    return (_glptr_Ortho) (GET_by_offset(disp, _gloffset_Ortho));
 }
 
-static INLINE void SET_Ortho(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Ortho(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Ortho, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PopMatrix)(void);
 #define CALL_PopMatrix(disp, parameters) \
     (* GET_PopMatrix(disp)) parameters
-static INLINE _glptr_PopMatrix GET_PopMatrix(struct _glapi_table *disp) {
+static inline _glptr_PopMatrix GET_PopMatrix(struct _glapi_table *disp) {
    return (_glptr_PopMatrix) (GET_by_offset(disp, _gloffset_PopMatrix));
 }
 
-static INLINE void SET_PopMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PopMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PopMatrix, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PushMatrix)(void);
 #define CALL_PushMatrix(disp, parameters) \
     (* GET_PushMatrix(disp)) parameters
-static INLINE _glptr_PushMatrix GET_PushMatrix(struct _glapi_table *disp) {
+static inline _glptr_PushMatrix GET_PushMatrix(struct _glapi_table *disp) {
    return (_glptr_PushMatrix) (GET_by_offset(disp, _gloffset_PushMatrix));
 }
 
-static INLINE void SET_PushMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PushMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PushMatrix, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rotated)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Rotated(disp, parameters) \
     (* GET_Rotated(disp)) parameters
-static INLINE _glptr_Rotated GET_Rotated(struct _glapi_table *disp) {
+static inline _glptr_Rotated GET_Rotated(struct _glapi_table *disp) {
    return (_glptr_Rotated) (GET_by_offset(disp, _gloffset_Rotated));
 }
 
-static INLINE void SET_Rotated(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Rotated(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Rotated, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Rotatef)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Rotatef(disp, parameters) \
     (* GET_Rotatef(disp)) parameters
-static INLINE _glptr_Rotatef GET_Rotatef(struct _glapi_table *disp) {
+static inline _glptr_Rotatef GET_Rotatef(struct _glapi_table *disp) {
    return (_glptr_Rotatef) (GET_by_offset(disp, _gloffset_Rotatef));
 }
 
-static INLINE void SET_Rotatef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Rotatef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Rotatef, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Scaled)(GLdouble, GLdouble, GLdouble);
 #define CALL_Scaled(disp, parameters) \
     (* GET_Scaled(disp)) parameters
-static INLINE _glptr_Scaled GET_Scaled(struct _glapi_table *disp) {
+static inline _glptr_Scaled GET_Scaled(struct _glapi_table *disp) {
    return (_glptr_Scaled) (GET_by_offset(disp, _gloffset_Scaled));
 }
 
-static INLINE void SET_Scaled(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Scaled(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Scaled, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Scalef)(GLfloat, GLfloat, GLfloat);
 #define CALL_Scalef(disp, parameters) \
     (* GET_Scalef(disp)) parameters
-static INLINE _glptr_Scalef GET_Scalef(struct _glapi_table *disp) {
+static inline _glptr_Scalef GET_Scalef(struct _glapi_table *disp) {
    return (_glptr_Scalef) (GET_by_offset(disp, _gloffset_Scalef));
 }
 
-static INLINE void SET_Scalef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Scalef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Scalef, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Translated)(GLdouble, GLdouble, GLdouble);
 #define CALL_Translated(disp, parameters) \
     (* GET_Translated(disp)) parameters
-static INLINE _glptr_Translated GET_Translated(struct _glapi_table *disp) {
+static inline _glptr_Translated GET_Translated(struct _glapi_table *disp) {
    return (_glptr_Translated) (GET_by_offset(disp, _gloffset_Translated));
 }
 
-static INLINE void SET_Translated(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_Translated(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_Translated, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Translatef)(GLfloat, GLfloat, GLfloat);
 #define CALL_Translatef(disp, parameters) \
     (* GET_Translatef(disp)) parameters
-static INLINE _glptr_Translatef GET_Translatef(struct _glapi_table *disp) {
+static inline _glptr_Translatef GET_Translatef(struct _glapi_table *disp) {
    return (_glptr_Translatef) (GET_by_offset(disp, _gloffset_Translatef));
 }
 
-static INLINE void SET_Translatef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Translatef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Translatef, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Viewport)(GLint, GLint, GLsizei, GLsizei);
 #define CALL_Viewport(disp, parameters) \
     (* GET_Viewport(disp)) parameters
-static INLINE _glptr_Viewport GET_Viewport(struct _glapi_table *disp) {
+static inline _glptr_Viewport GET_Viewport(struct _glapi_table *disp) {
    return (_glptr_Viewport) (GET_by_offset(disp, _gloffset_Viewport));
 }
 
-static INLINE void SET_Viewport(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei)) {
+static inline void SET_Viewport(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_Viewport, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ArrayElement)(GLint);
 #define CALL_ArrayElement(disp, parameters) \
     (* GET_ArrayElement(disp)) parameters
-static INLINE _glptr_ArrayElement GET_ArrayElement(struct _glapi_table *disp) {
+static inline _glptr_ArrayElement GET_ArrayElement(struct _glapi_table *disp) {
    return (_glptr_ArrayElement) (GET_by_offset(disp, _gloffset_ArrayElement));
 }
 
-static INLINE void SET_ArrayElement(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
+static inline void SET_ArrayElement(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) {
    SET_by_offset(disp, _gloffset_ArrayElement, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindTexture)(GLenum, GLuint);
 #define CALL_BindTexture(disp, parameters) \
     (* GET_BindTexture(disp)) parameters
-static INLINE _glptr_BindTexture GET_BindTexture(struct _glapi_table *disp) {
+static inline _glptr_BindTexture GET_BindTexture(struct _glapi_table *disp) {
    return (_glptr_BindTexture) (GET_by_offset(disp, _gloffset_BindTexture));
 }
 
-static INLINE void SET_BindTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BindTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BindTexture, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorPointer)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_ColorPointer(disp, parameters) \
     (* GET_ColorPointer(disp)) parameters
-static INLINE _glptr_ColorPointer GET_ColorPointer(struct _glapi_table *disp) {
+static inline _glptr_ColorPointer GET_ColorPointer(struct _glapi_table *disp) {
    return (_glptr_ColorPointer) (GET_by_offset(disp, _gloffset_ColorPointer));
 }
 
-static INLINE void SET_ColorPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_ColorPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ColorPointer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DisableClientState)(GLenum);
 #define CALL_DisableClientState(disp, parameters) \
     (* GET_DisableClientState(disp)) parameters
-static INLINE _glptr_DisableClientState GET_DisableClientState(struct _glapi_table *disp) {
+static inline _glptr_DisableClientState GET_DisableClientState(struct _glapi_table *disp) {
    return (_glptr_DisableClientState) (GET_by_offset(disp, _gloffset_DisableClientState));
 }
 
-static INLINE void SET_DisableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_DisableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_DisableClientState, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawArrays)(GLenum, GLint, GLsizei);
 #define CALL_DrawArrays(disp, parameters) \
     (* GET_DrawArrays(disp)) parameters
-static INLINE _glptr_DrawArrays GET_DrawArrays(struct _glapi_table *disp) {
+static inline _glptr_DrawArrays GET_DrawArrays(struct _glapi_table *disp) {
    return (_glptr_DrawArrays) (GET_by_offset(disp, _gloffset_DrawArrays));
 }
 
-static INLINE void SET_DrawArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei)) {
+static inline void SET_DrawArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei)) {
    SET_by_offset(disp, _gloffset_DrawArrays, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawElements)(GLenum, GLsizei, GLenum, const GLvoid *);
 #define CALL_DrawElements(disp, parameters) \
     (* GET_DrawElements(disp)) parameters
-static INLINE _glptr_DrawElements GET_DrawElements(struct _glapi_table *disp) {
+static inline _glptr_DrawElements GET_DrawElements(struct _glapi_table *disp) {
    return (_glptr_DrawElements) (GET_by_offset(disp, _gloffset_DrawElements));
 }
 
-static INLINE void SET_DrawElements(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *)) {
+static inline void SET_DrawElements(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_DrawElements, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EdgeFlagPointer)(GLsizei, const GLvoid *);
 #define CALL_EdgeFlagPointer(disp, parameters) \
     (* GET_EdgeFlagPointer(disp)) parameters
-static INLINE _glptr_EdgeFlagPointer GET_EdgeFlagPointer(struct _glapi_table *disp) {
+static inline _glptr_EdgeFlagPointer GET_EdgeFlagPointer(struct _glapi_table *disp) {
    return (_glptr_EdgeFlagPointer) (GET_by_offset(disp, _gloffset_EdgeFlagPointer));
 }
 
-static INLINE void SET_EdgeFlagPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLvoid *)) {
+static inline void SET_EdgeFlagPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_EdgeFlagPointer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EnableClientState)(GLenum);
 #define CALL_EnableClientState(disp, parameters) \
     (* GET_EnableClientState(disp)) parameters
-static INLINE _glptr_EnableClientState GET_EnableClientState(struct _glapi_table *disp) {
+static inline _glptr_EnableClientState GET_EnableClientState(struct _glapi_table *disp) {
    return (_glptr_EnableClientState) (GET_by_offset(disp, _gloffset_EnableClientState));
 }
 
-static INLINE void SET_EnableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_EnableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_EnableClientState, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_IndexPointer)(GLenum, GLsizei, const GLvoid *);
 #define CALL_IndexPointer(disp, parameters) \
     (* GET_IndexPointer(disp)) parameters
-static INLINE _glptr_IndexPointer GET_IndexPointer(struct _glapi_table *disp) {
+static inline _glptr_IndexPointer GET_IndexPointer(struct _glapi_table *disp) {
    return (_glptr_IndexPointer) (GET_by_offset(disp, _gloffset_IndexPointer));
 }
 
-static INLINE void SET_IndexPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_IndexPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_IndexPointer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexub)(GLubyte);
 #define CALL_Indexub(disp, parameters) \
     (* GET_Indexub(disp)) parameters
-static INLINE _glptr_Indexub GET_Indexub(struct _glapi_table *disp) {
+static inline _glptr_Indexub GET_Indexub(struct _glapi_table *disp) {
    return (_glptr_Indexub) (GET_by_offset(disp, _gloffset_Indexub));
 }
 
-static INLINE void SET_Indexub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte)) {
+static inline void SET_Indexub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte)) {
    SET_by_offset(disp, _gloffset_Indexub, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Indexubv)(const GLubyte *);
 #define CALL_Indexubv(disp, parameters) \
     (* GET_Indexubv(disp)) parameters
-static INLINE _glptr_Indexubv GET_Indexubv(struct _glapi_table *disp) {
+static inline _glptr_Indexubv GET_Indexubv(struct _glapi_table *disp) {
    return (_glptr_Indexubv) (GET_by_offset(disp, _gloffset_Indexubv));
 }
 
-static INLINE void SET_Indexubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
+static inline void SET_Indexubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
    SET_by_offset(disp, _gloffset_Indexubv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_InterleavedArrays)(GLenum, GLsizei, const GLvoid *);
 #define CALL_InterleavedArrays(disp, parameters) \
     (* GET_InterleavedArrays(disp)) parameters
-static INLINE _glptr_InterleavedArrays GET_InterleavedArrays(struct _glapi_table *disp) {
+static inline _glptr_InterleavedArrays GET_InterleavedArrays(struct _glapi_table *disp) {
    return (_glptr_InterleavedArrays) (GET_by_offset(disp, _gloffset_InterleavedArrays));
 }
 
-static INLINE void SET_InterleavedArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_InterleavedArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_InterleavedArrays, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_NormalPointer)(GLenum, GLsizei, const GLvoid *);
 #define CALL_NormalPointer(disp, parameters) \
     (* GET_NormalPointer(disp)) parameters
-static INLINE _glptr_NormalPointer GET_NormalPointer(struct _glapi_table *disp) {
+static inline _glptr_NormalPointer GET_NormalPointer(struct _glapi_table *disp) {
    return (_glptr_NormalPointer) (GET_by_offset(disp, _gloffset_NormalPointer));
 }
 
-static INLINE void SET_NormalPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_NormalPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_NormalPointer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PolygonOffset)(GLfloat, GLfloat);
 #define CALL_PolygonOffset(disp, parameters) \
     (* GET_PolygonOffset(disp)) parameters
-static INLINE _glptr_PolygonOffset GET_PolygonOffset(struct _glapi_table *disp) {
+static inline _glptr_PolygonOffset GET_PolygonOffset(struct _glapi_table *disp) {
    return (_glptr_PolygonOffset) (GET_by_offset(disp, _gloffset_PolygonOffset));
 }
 
-static INLINE void SET_PolygonOffset(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_PolygonOffset(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_PolygonOffset, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordPointer)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_TexCoordPointer(disp, parameters) \
     (* GET_TexCoordPointer(disp)) parameters
-static INLINE _glptr_TexCoordPointer GET_TexCoordPointer(struct _glapi_table *disp) {
+static inline _glptr_TexCoordPointer GET_TexCoordPointer(struct _glapi_table *disp) {
    return (_glptr_TexCoordPointer) (GET_by_offset(disp, _gloffset_TexCoordPointer));
 }
 
-static INLINE void SET_TexCoordPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_TexCoordPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexCoordPointer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexPointer)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_VertexPointer(disp, parameters) \
     (* GET_VertexPointer(disp)) parameters
-static INLINE _glptr_VertexPointer GET_VertexPointer(struct _glapi_table *disp) {
+static inline _glptr_VertexPointer GET_VertexPointer(struct _glapi_table *disp) {
    return (_glptr_VertexPointer) (GET_by_offset(disp, _gloffset_VertexPointer));
 }
 
-static INLINE void SET_VertexPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_VertexPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_VertexPointer, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_AreTexturesResident)(GLsizei, const GLuint *, GLboolean *);
 #define CALL_AreTexturesResident(disp, parameters) \
     (* GET_AreTexturesResident(disp)) parameters
-static INLINE _glptr_AreTexturesResident GET_AreTexturesResident(struct _glapi_table *disp) {
+static inline _glptr_AreTexturesResident GET_AreTexturesResident(struct _glapi_table *disp) {
    return (_glptr_AreTexturesResident) (GET_by_offset(disp, _gloffset_AreTexturesResident));
 }
 
-static INLINE void SET_AreTexturesResident(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLboolean *)) {
+static inline void SET_AreTexturesResident(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLboolean *)) {
    SET_by_offset(disp, _gloffset_AreTexturesResident, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyTexImage1D)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
 #define CALL_CopyTexImage1D(disp, parameters) \
     (* GET_CopyTexImage1D(disp)) parameters
-static INLINE _glptr_CopyTexImage1D GET_CopyTexImage1D(struct _glapi_table *disp) {
+static inline _glptr_CopyTexImage1D GET_CopyTexImage1D(struct _glapi_table *disp) {
    return (_glptr_CopyTexImage1D) (GET_by_offset(disp, _gloffset_CopyTexImage1D));
 }
 
-static INLINE void SET_CopyTexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint)) {
+static inline void SET_CopyTexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint)) {
    SET_by_offset(disp, _gloffset_CopyTexImage1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyTexImage2D)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
 #define CALL_CopyTexImage2D(disp, parameters) \
     (* GET_CopyTexImage2D(disp)) parameters
-static INLINE _glptr_CopyTexImage2D GET_CopyTexImage2D(struct _glapi_table *disp) {
+static inline _glptr_CopyTexImage2D GET_CopyTexImage2D(struct _glapi_table *disp) {
    return (_glptr_CopyTexImage2D) (GET_by_offset(disp, _gloffset_CopyTexImage2D));
 }
 
-static INLINE void SET_CopyTexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint)) {
+static inline void SET_CopyTexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint)) {
    SET_by_offset(disp, _gloffset_CopyTexImage2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyTexSubImage1D)(GLenum, GLint, GLint, GLint, GLint, GLsizei);
 #define CALL_CopyTexSubImage1D(disp, parameters) \
     (* GET_CopyTexSubImage1D(disp)) parameters
-static INLINE _glptr_CopyTexSubImage1D GET_CopyTexSubImage1D(struct _glapi_table *disp) {
+static inline _glptr_CopyTexSubImage1D GET_CopyTexSubImage1D(struct _glapi_table *disp) {
    return (_glptr_CopyTexSubImage1D) (GET_by_offset(disp, _gloffset_CopyTexSubImage1D));
 }
 
-static INLINE void SET_CopyTexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei)) {
+static inline void SET_CopyTexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyTexSubImage1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyTexSubImage2D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
 #define CALL_CopyTexSubImage2D(disp, parameters) \
     (* GET_CopyTexSubImage2D(disp)) parameters
-static INLINE _glptr_CopyTexSubImage2D GET_CopyTexSubImage2D(struct _glapi_table *disp) {
+static inline _glptr_CopyTexSubImage2D GET_CopyTexSubImage2D(struct _glapi_table *disp) {
    return (_glptr_CopyTexSubImage2D) (GET_by_offset(disp, _gloffset_CopyTexSubImage2D));
 }
 
-static INLINE void SET_CopyTexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
+static inline void SET_CopyTexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyTexSubImage2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteTextures)(GLsizei, const GLuint *);
 #define CALL_DeleteTextures(disp, parameters) \
     (* GET_DeleteTextures(disp)) parameters
-static INLINE _glptr_DeleteTextures GET_DeleteTextures(struct _glapi_table *disp) {
+static inline _glptr_DeleteTextures GET_DeleteTextures(struct _glapi_table *disp) {
    return (_glptr_DeleteTextures) (GET_by_offset(disp, _gloffset_DeleteTextures));
 }
 
-static INLINE void SET_DeleteTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteTextures, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenTextures)(GLsizei, GLuint *);
 #define CALL_GenTextures(disp, parameters) \
     (* GET_GenTextures(disp)) parameters
-static INLINE _glptr_GenTextures GET_GenTextures(struct _glapi_table *disp) {
+static inline _glptr_GenTextures GET_GenTextures(struct _glapi_table *disp) {
    return (_glptr_GenTextures) (GET_by_offset(disp, _gloffset_GenTextures));
 }
 
-static INLINE void SET_GenTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenTextures, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPointerv)(GLenum, GLvoid **);
 #define CALL_GetPointerv(disp, parameters) \
     (* GET_GetPointerv(disp)) parameters
-static INLINE _glptr_GetPointerv GET_GetPointerv(struct _glapi_table *disp) {
+static inline _glptr_GetPointerv GET_GetPointerv(struct _glapi_table *disp) {
    return (_glptr_GetPointerv) (GET_by_offset(disp, _gloffset_GetPointerv));
 }
 
-static INLINE void SET_GetPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid **)) {
+static inline void SET_GetPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid **)) {
    SET_by_offset(disp, _gloffset_GetPointerv, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsTexture)(GLuint);
 #define CALL_IsTexture(disp, parameters) \
     (* GET_IsTexture(disp)) parameters
-static INLINE _glptr_IsTexture GET_IsTexture(struct _glapi_table *disp) {
+static inline _glptr_IsTexture GET_IsTexture(struct _glapi_table *disp) {
    return (_glptr_IsTexture) (GET_by_offset(disp, _gloffset_IsTexture));
 }
 
-static INLINE void SET_IsTexture(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsTexture(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsTexture, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PrioritizeTextures)(GLsizei, const GLuint *, const GLclampf *);
 #define CALL_PrioritizeTextures(disp, parameters) \
     (* GET_PrioritizeTextures(disp)) parameters
-static INLINE _glptr_PrioritizeTextures GET_PrioritizeTextures(struct _glapi_table *disp) {
+static inline _glptr_PrioritizeTextures GET_PrioritizeTextures(struct _glapi_table *disp) {
    return (_glptr_PrioritizeTextures) (GET_by_offset(disp, _gloffset_PrioritizeTextures));
 }
 
-static INLINE void SET_PrioritizeTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *, const GLclampf *)) {
+static inline void SET_PrioritizeTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *, const GLclampf *)) {
    SET_by_offset(disp, _gloffset_PrioritizeTextures, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexSubImage1D)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_TexSubImage1D(disp, parameters) \
     (* GET_TexSubImage1D(disp)) parameters
-static INLINE _glptr_TexSubImage1D GET_TexSubImage1D(struct _glapi_table *disp) {
+static inline _glptr_TexSubImage1D GET_TexSubImage1D(struct _glapi_table *disp) {
    return (_glptr_TexSubImage1D) (GET_by_offset(disp, _gloffset_TexSubImage1D));
 }
 
-static INLINE void SET_TexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_TexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexSubImage1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_TexSubImage2D(disp, parameters) \
     (* GET_TexSubImage2D(disp)) parameters
-static INLINE _glptr_TexSubImage2D GET_TexSubImage2D(struct _glapi_table *disp) {
+static inline _glptr_TexSubImage2D GET_TexSubImage2D(struct _glapi_table *disp) {
    return (_glptr_TexSubImage2D) (GET_by_offset(disp, _gloffset_TexSubImage2D));
 }
 
-static INLINE void SET_TexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_TexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexSubImage2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PopClientAttrib)(void);
 #define CALL_PopClientAttrib(disp, parameters) \
     (* GET_PopClientAttrib(disp)) parameters
-static INLINE _glptr_PopClientAttrib GET_PopClientAttrib(struct _glapi_table *disp) {
+static inline _glptr_PopClientAttrib GET_PopClientAttrib(struct _glapi_table *disp) {
    return (_glptr_PopClientAttrib) (GET_by_offset(disp, _gloffset_PopClientAttrib));
 }
 
-static INLINE void SET_PopClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PopClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PopClientAttrib, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PushClientAttrib)(GLbitfield);
 #define CALL_PushClientAttrib(disp, parameters) \
     (* GET_PushClientAttrib(disp)) parameters
-static INLINE _glptr_PushClientAttrib GET_PushClientAttrib(struct _glapi_table *disp) {
+static inline _glptr_PushClientAttrib GET_PushClientAttrib(struct _glapi_table *disp) {
    return (_glptr_PushClientAttrib) (GET_by_offset(disp, _gloffset_PushClientAttrib));
 }
 
-static INLINE void SET_PushClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) {
+static inline void SET_PushClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) {
    SET_by_offset(disp, _gloffset_PushClientAttrib, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendColor)(GLclampf, GLclampf, GLclampf, GLclampf);
 #define CALL_BlendColor(disp, parameters) \
     (* GET_BlendColor(disp)) parameters
-static INLINE _glptr_BlendColor GET_BlendColor(struct _glapi_table *disp) {
+static inline _glptr_BlendColor GET_BlendColor(struct _glapi_table *disp) {
    return (_glptr_BlendColor) (GET_by_offset(disp, _gloffset_BlendColor));
 }
 
-static INLINE void SET_BlendColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf, GLclampf, GLclampf)) {
+static inline void SET_BlendColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf, GLclampf, GLclampf)) {
    SET_by_offset(disp, _gloffset_BlendColor, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendEquation)(GLenum);
 #define CALL_BlendEquation(disp, parameters) \
     (* GET_BlendEquation(disp)) parameters
-static INLINE _glptr_BlendEquation GET_BlendEquation(struct _glapi_table *disp) {
+static inline _glptr_BlendEquation GET_BlendEquation(struct _glapi_table *disp) {
    return (_glptr_BlendEquation) (GET_by_offset(disp, _gloffset_BlendEquation));
 }
 
-static INLINE void SET_BlendEquation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_BlendEquation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_BlendEquation, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawRangeElements)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
 #define CALL_DrawRangeElements(disp, parameters) \
     (* GET_DrawRangeElements(disp)) parameters
-static INLINE _glptr_DrawRangeElements GET_DrawRangeElements(struct _glapi_table *disp) {
+static inline _glptr_DrawRangeElements GET_DrawRangeElements(struct _glapi_table *disp) {
    return (_glptr_DrawRangeElements) (GET_by_offset(disp, _gloffset_DrawRangeElements));
 }
 
-static INLINE void SET_DrawRangeElements(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *)) {
+static inline void SET_DrawRangeElements(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_DrawRangeElements, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorTable)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ColorTable(disp, parameters) \
     (* GET_ColorTable(disp)) parameters
-static INLINE _glptr_ColorTable GET_ColorTable(struct _glapi_table *disp) {
+static inline _glptr_ColorTable GET_ColorTable(struct _glapi_table *disp) {
    return (_glptr_ColorTable) (GET_by_offset(disp, _gloffset_ColorTable));
 }
 
-static INLINE void SET_ColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_ColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ColorTable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorTableParameterfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_ColorTableParameterfv(disp, parameters) \
     (* GET_ColorTableParameterfv(disp)) parameters
-static INLINE _glptr_ColorTableParameterfv GET_ColorTableParameterfv(struct _glapi_table *disp) {
+static inline _glptr_ColorTableParameterfv GET_ColorTableParameterfv(struct _glapi_table *disp) {
    return (_glptr_ColorTableParameterfv) (GET_by_offset(disp, _gloffset_ColorTableParameterfv));
 }
 
-static INLINE void SET_ColorTableParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_ColorTableParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ColorTableParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorTableParameteriv)(GLenum, GLenum, const GLint *);
 #define CALL_ColorTableParameteriv(disp, parameters) \
     (* GET_ColorTableParameteriv(disp)) parameters
-static INLINE _glptr_ColorTableParameteriv GET_ColorTableParameteriv(struct _glapi_table *disp) {
+static inline _glptr_ColorTableParameteriv GET_ColorTableParameteriv(struct _glapi_table *disp) {
    return (_glptr_ColorTableParameteriv) (GET_by_offset(disp, _gloffset_ColorTableParameteriv));
 }
 
-static INLINE void SET_ColorTableParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_ColorTableParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_ColorTableParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyColorTable)(GLenum, GLenum, GLint, GLint, GLsizei);
 #define CALL_CopyColorTable(disp, parameters) \
     (* GET_CopyColorTable(disp)) parameters
-static INLINE _glptr_CopyColorTable GET_CopyColorTable(struct _glapi_table *disp) {
+static inline _glptr_CopyColorTable GET_CopyColorTable(struct _glapi_table *disp) {
    return (_glptr_CopyColorTable) (GET_by_offset(disp, _gloffset_CopyColorTable));
 }
 
-static INLINE void SET_CopyColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei)) {
+static inline void SET_CopyColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyColorTable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetColorTable)(GLenum, GLenum, GLenum, GLvoid *);
 #define CALL_GetColorTable(disp, parameters) \
     (* GET_GetColorTable(disp)) parameters
-static INLINE _glptr_GetColorTable GET_GetColorTable(struct _glapi_table *disp) {
+static inline _glptr_GetColorTable GET_GetColorTable(struct _glapi_table *disp) {
    return (_glptr_GetColorTable) (GET_by_offset(disp, _gloffset_GetColorTable));
 }
 
-static INLINE void SET_GetColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *)) {
+static inline void SET_GetColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetColorTable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetColorTableParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetColorTableParameterfv(disp, parameters) \
     (* GET_GetColorTableParameterfv(disp)) parameters
-static INLINE _glptr_GetColorTableParameterfv GET_GetColorTableParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetColorTableParameterfv GET_GetColorTableParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetColorTableParameterfv) (GET_by_offset(disp, _gloffset_GetColorTableParameterfv));
 }
 
-static INLINE void SET_GetColorTableParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetColorTableParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetColorTableParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetColorTableParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetColorTableParameteriv(disp, parameters) \
     (* GET_GetColorTableParameteriv(disp)) parameters
-static INLINE _glptr_GetColorTableParameteriv GET_GetColorTableParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetColorTableParameteriv GET_GetColorTableParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetColorTableParameteriv) (GET_by_offset(disp, _gloffset_GetColorTableParameteriv));
 }
 
-static INLINE void SET_GetColorTableParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetColorTableParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetColorTableParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorSubTable)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ColorSubTable(disp, parameters) \
     (* GET_ColorSubTable(disp)) parameters
-static INLINE _glptr_ColorSubTable GET_ColorSubTable(struct _glapi_table *disp) {
+static inline _glptr_ColorSubTable GET_ColorSubTable(struct _glapi_table *disp) {
    return (_glptr_ColorSubTable) (GET_by_offset(disp, _gloffset_ColorSubTable));
 }
 
-static INLINE void SET_ColorSubTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_ColorSubTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ColorSubTable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyColorSubTable)(GLenum, GLsizei, GLint, GLint, GLsizei);
 #define CALL_CopyColorSubTable(disp, parameters) \
     (* GET_CopyColorSubTable(disp)) parameters
-static INLINE _glptr_CopyColorSubTable GET_CopyColorSubTable(struct _glapi_table *disp) {
+static inline _glptr_CopyColorSubTable GET_CopyColorSubTable(struct _glapi_table *disp) {
    return (_glptr_CopyColorSubTable) (GET_by_offset(disp, _gloffset_CopyColorSubTable));
 }
 
-static INLINE void SET_CopyColorSubTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLint, GLint, GLsizei)) {
+static inline void SET_CopyColorSubTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLint, GLint, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyColorSubTable, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ConvolutionFilter1D)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ConvolutionFilter1D(disp, parameters) \
     (* GET_ConvolutionFilter1D(disp)) parameters
-static INLINE _glptr_ConvolutionFilter1D GET_ConvolutionFilter1D(struct _glapi_table *disp) {
+static inline _glptr_ConvolutionFilter1D GET_ConvolutionFilter1D(struct _glapi_table *disp) {
    return (_glptr_ConvolutionFilter1D) (GET_by_offset(disp, _gloffset_ConvolutionFilter1D));
 }
 
-static INLINE void SET_ConvolutionFilter1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_ConvolutionFilter1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ConvolutionFilter1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ConvolutionFilter2D)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ConvolutionFilter2D(disp, parameters) \
     (* GET_ConvolutionFilter2D(disp)) parameters
-static INLINE _glptr_ConvolutionFilter2D GET_ConvolutionFilter2D(struct _glapi_table *disp) {
+static inline _glptr_ConvolutionFilter2D GET_ConvolutionFilter2D(struct _glapi_table *disp) {
    return (_glptr_ConvolutionFilter2D) (GET_by_offset(disp, _gloffset_ConvolutionFilter2D));
 }
 
-static INLINE void SET_ConvolutionFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_ConvolutionFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ConvolutionFilter2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ConvolutionParameterf)(GLenum, GLenum, GLfloat);
 #define CALL_ConvolutionParameterf(disp, parameters) \
     (* GET_ConvolutionParameterf(disp)) parameters
-static INLINE _glptr_ConvolutionParameterf GET_ConvolutionParameterf(struct _glapi_table *disp) {
+static inline _glptr_ConvolutionParameterf GET_ConvolutionParameterf(struct _glapi_table *disp) {
    return (_glptr_ConvolutionParameterf) (GET_by_offset(disp, _gloffset_ConvolutionParameterf));
 }
 
-static INLINE void SET_ConvolutionParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
+static inline void SET_ConvolutionParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_ConvolutionParameterf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ConvolutionParameterfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_ConvolutionParameterfv(disp, parameters) \
     (* GET_ConvolutionParameterfv(disp)) parameters
-static INLINE _glptr_ConvolutionParameterfv GET_ConvolutionParameterfv(struct _glapi_table *disp) {
+static inline _glptr_ConvolutionParameterfv GET_ConvolutionParameterfv(struct _glapi_table *disp) {
    return (_glptr_ConvolutionParameterfv) (GET_by_offset(disp, _gloffset_ConvolutionParameterfv));
 }
 
-static INLINE void SET_ConvolutionParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
+static inline void SET_ConvolutionParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ConvolutionParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ConvolutionParameteri)(GLenum, GLenum, GLint);
 #define CALL_ConvolutionParameteri(disp, parameters) \
     (* GET_ConvolutionParameteri(disp)) parameters
-static INLINE _glptr_ConvolutionParameteri GET_ConvolutionParameteri(struct _glapi_table *disp) {
+static inline _glptr_ConvolutionParameteri GET_ConvolutionParameteri(struct _glapi_table *disp) {
    return (_glptr_ConvolutionParameteri) (GET_by_offset(disp, _gloffset_ConvolutionParameteri));
 }
 
-static INLINE void SET_ConvolutionParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_ConvolutionParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_ConvolutionParameteri, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ConvolutionParameteriv)(GLenum, GLenum, const GLint *);
 #define CALL_ConvolutionParameteriv(disp, parameters) \
     (* GET_ConvolutionParameteriv(disp)) parameters
-static INLINE _glptr_ConvolutionParameteriv GET_ConvolutionParameteriv(struct _glapi_table *disp) {
+static inline _glptr_ConvolutionParameteriv GET_ConvolutionParameteriv(struct _glapi_table *disp) {
    return (_glptr_ConvolutionParameteriv) (GET_by_offset(disp, _gloffset_ConvolutionParameteriv));
 }
 
-static INLINE void SET_ConvolutionParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_ConvolutionParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_ConvolutionParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter1D)(GLenum, GLenum, GLint, GLint, GLsizei);
 #define CALL_CopyConvolutionFilter1D(disp, parameters) \
     (* GET_CopyConvolutionFilter1D(disp)) parameters
-static INLINE _glptr_CopyConvolutionFilter1D GET_CopyConvolutionFilter1D(struct _glapi_table *disp) {
+static inline _glptr_CopyConvolutionFilter1D GET_CopyConvolutionFilter1D(struct _glapi_table *disp) {
    return (_glptr_CopyConvolutionFilter1D) (GET_by_offset(disp, _gloffset_CopyConvolutionFilter1D));
 }
 
-static INLINE void SET_CopyConvolutionFilter1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei)) {
+static inline void SET_CopyConvolutionFilter1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyConvolutionFilter1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter2D)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
 #define CALL_CopyConvolutionFilter2D(disp, parameters) \
     (* GET_CopyConvolutionFilter2D(disp)) parameters
-static INLINE _glptr_CopyConvolutionFilter2D GET_CopyConvolutionFilter2D(struct _glapi_table *disp) {
+static inline _glptr_CopyConvolutionFilter2D GET_CopyConvolutionFilter2D(struct _glapi_table *disp) {
    return (_glptr_CopyConvolutionFilter2D) (GET_by_offset(disp, _gloffset_CopyConvolutionFilter2D));
 }
 
-static INLINE void SET_CopyConvolutionFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei)) {
+static inline void SET_CopyConvolutionFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyConvolutionFilter2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetConvolutionFilter)(GLenum, GLenum, GLenum, GLvoid *);
 #define CALL_GetConvolutionFilter(disp, parameters) \
     (* GET_GetConvolutionFilter(disp)) parameters
-static INLINE _glptr_GetConvolutionFilter GET_GetConvolutionFilter(struct _glapi_table *disp) {
+static inline _glptr_GetConvolutionFilter GET_GetConvolutionFilter(struct _glapi_table *disp) {
    return (_glptr_GetConvolutionFilter) (GET_by_offset(disp, _gloffset_GetConvolutionFilter));
 }
 
-static INLINE void SET_GetConvolutionFilter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *)) {
+static inline void SET_GetConvolutionFilter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetConvolutionFilter, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetConvolutionParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetConvolutionParameterfv(disp, parameters) \
     (* GET_GetConvolutionParameterfv(disp)) parameters
-static INLINE _glptr_GetConvolutionParameterfv GET_GetConvolutionParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetConvolutionParameterfv GET_GetConvolutionParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetConvolutionParameterfv) (GET_by_offset(disp, _gloffset_GetConvolutionParameterfv));
 }
 
-static INLINE void SET_GetConvolutionParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetConvolutionParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetConvolutionParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetConvolutionParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetConvolutionParameteriv(disp, parameters) \
     (* GET_GetConvolutionParameteriv(disp)) parameters
-static INLINE _glptr_GetConvolutionParameteriv GET_GetConvolutionParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetConvolutionParameteriv GET_GetConvolutionParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetConvolutionParameteriv) (GET_by_offset(disp, _gloffset_GetConvolutionParameteriv));
 }
 
-static INLINE void SET_GetConvolutionParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetConvolutionParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetConvolutionParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetSeparableFilter)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
 #define CALL_GetSeparableFilter(disp, parameters) \
     (* GET_GetSeparableFilter(disp)) parameters
-static INLINE _glptr_GetSeparableFilter GET_GetSeparableFilter(struct _glapi_table *disp) {
+static inline _glptr_GetSeparableFilter GET_GetSeparableFilter(struct _glapi_table *disp) {
    return (_glptr_GetSeparableFilter) (GET_by_offset(disp, _gloffset_GetSeparableFilter));
 }
 
-static INLINE void SET_GetSeparableFilter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *)) {
+static inline void SET_GetSeparableFilter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetSeparableFilter, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SeparableFilter2D)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
 #define CALL_SeparableFilter2D(disp, parameters) \
     (* GET_SeparableFilter2D(disp)) parameters
-static INLINE _glptr_SeparableFilter2D GET_SeparableFilter2D(struct _glapi_table *disp) {
+static inline _glptr_SeparableFilter2D GET_SeparableFilter2D(struct _glapi_table *disp) {
    return (_glptr_SeparableFilter2D) (GET_by_offset(disp, _gloffset_SeparableFilter2D));
 }
 
-static INLINE void SET_SeparableFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *)) {
+static inline void SET_SeparableFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_SeparableFilter2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetHistogram)(GLenum, GLboolean, GLenum, GLenum, GLvoid *);
 #define CALL_GetHistogram(disp, parameters) \
     (* GET_GetHistogram(disp)) parameters
-static INLINE _glptr_GetHistogram GET_GetHistogram(struct _glapi_table *disp) {
+static inline _glptr_GetHistogram GET_GetHistogram(struct _glapi_table *disp) {
    return (_glptr_GetHistogram) (GET_by_offset(disp, _gloffset_GetHistogram));
 }
 
-static INLINE void SET_GetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)) {
+static inline void SET_GetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetHistogram, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetHistogramParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetHistogramParameterfv(disp, parameters) \
     (* GET_GetHistogramParameterfv(disp)) parameters
-static INLINE _glptr_GetHistogramParameterfv GET_GetHistogramParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetHistogramParameterfv GET_GetHistogramParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetHistogramParameterfv) (GET_by_offset(disp, _gloffset_GetHistogramParameterfv));
 }
 
-static INLINE void SET_GetHistogramParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetHistogramParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetHistogramParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetHistogramParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetHistogramParameteriv(disp, parameters) \
     (* GET_GetHistogramParameteriv(disp)) parameters
-static INLINE _glptr_GetHistogramParameteriv GET_GetHistogramParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetHistogramParameteriv GET_GetHistogramParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetHistogramParameteriv) (GET_by_offset(disp, _gloffset_GetHistogramParameteriv));
 }
 
-static INLINE void SET_GetHistogramParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetHistogramParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetHistogramParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMinmax)(GLenum, GLboolean, GLenum, GLenum, GLvoid *);
 #define CALL_GetMinmax(disp, parameters) \
     (* GET_GetMinmax(disp)) parameters
-static INLINE _glptr_GetMinmax GET_GetMinmax(struct _glapi_table *disp) {
+static inline _glptr_GetMinmax GET_GetMinmax(struct _glapi_table *disp) {
    return (_glptr_GetMinmax) (GET_by_offset(disp, _gloffset_GetMinmax));
 }
 
-static INLINE void SET_GetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)) {
+static inline void SET_GetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetMinmax, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMinmaxParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetMinmaxParameterfv(disp, parameters) \
     (* GET_GetMinmaxParameterfv(disp)) parameters
-static INLINE _glptr_GetMinmaxParameterfv GET_GetMinmaxParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetMinmaxParameterfv GET_GetMinmaxParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetMinmaxParameterfv) (GET_by_offset(disp, _gloffset_GetMinmaxParameterfv));
 }
 
-static INLINE void SET_GetMinmaxParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetMinmaxParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetMinmaxParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetMinmaxParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetMinmaxParameteriv(disp, parameters) \
     (* GET_GetMinmaxParameteriv(disp)) parameters
-static INLINE _glptr_GetMinmaxParameteriv GET_GetMinmaxParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetMinmaxParameteriv GET_GetMinmaxParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetMinmaxParameteriv) (GET_by_offset(disp, _gloffset_GetMinmaxParameteriv));
 }
 
-static INLINE void SET_GetMinmaxParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetMinmaxParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetMinmaxParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Histogram)(GLenum, GLsizei, GLenum, GLboolean);
 #define CALL_Histogram(disp, parameters) \
     (* GET_Histogram(disp)) parameters
-static INLINE _glptr_Histogram GET_Histogram(struct _glapi_table *disp) {
+static inline _glptr_Histogram GET_Histogram(struct _glapi_table *disp) {
    return (_glptr_Histogram) (GET_by_offset(disp, _gloffset_Histogram));
 }
 
-static INLINE void SET_Histogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLboolean)) {
+static inline void SET_Histogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLboolean)) {
    SET_by_offset(disp, _gloffset_Histogram, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Minmax)(GLenum, GLenum, GLboolean);
 #define CALL_Minmax(disp, parameters) \
     (* GET_Minmax(disp)) parameters
-static INLINE _glptr_Minmax GET_Minmax(struct _glapi_table *disp) {
+static inline _glptr_Minmax GET_Minmax(struct _glapi_table *disp) {
    return (_glptr_Minmax) (GET_by_offset(disp, _gloffset_Minmax));
 }
 
-static INLINE void SET_Minmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLboolean)) {
+static inline void SET_Minmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLboolean)) {
    SET_by_offset(disp, _gloffset_Minmax, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ResetHistogram)(GLenum);
 #define CALL_ResetHistogram(disp, parameters) \
     (* GET_ResetHistogram(disp)) parameters
-static INLINE _glptr_ResetHistogram GET_ResetHistogram(struct _glapi_table *disp) {
+static inline _glptr_ResetHistogram GET_ResetHistogram(struct _glapi_table *disp) {
    return (_glptr_ResetHistogram) (GET_by_offset(disp, _gloffset_ResetHistogram));
 }
 
-static INLINE void SET_ResetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ResetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ResetHistogram, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ResetMinmax)(GLenum);
 #define CALL_ResetMinmax(disp, parameters) \
     (* GET_ResetMinmax(disp)) parameters
-static INLINE _glptr_ResetMinmax GET_ResetMinmax(struct _glapi_table *disp) {
+static inline _glptr_ResetMinmax GET_ResetMinmax(struct _glapi_table *disp) {
    return (_glptr_ResetMinmax) (GET_by_offset(disp, _gloffset_ResetMinmax));
 }
 
-static INLINE void SET_ResetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ResetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ResetMinmax, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexImage3D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 #define CALL_TexImage3D(disp, parameters) \
     (* GET_TexImage3D(disp)) parameters
-static INLINE _glptr_TexImage3D GET_TexImage3D(struct _glapi_table *disp) {
+static inline _glptr_TexImage3D GET_TexImage3D(struct _glapi_table *disp) {
    return (_glptr_TexImage3D) (GET_by_offset(disp, _gloffset_TexImage3D));
 }
 
-static INLINE void SET_TexImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_TexImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexImage3D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_TexSubImage3D(disp, parameters) \
     (* GET_TexSubImage3D(disp)) parameters
-static INLINE _glptr_TexSubImage3D GET_TexSubImage3D(struct _glapi_table *disp) {
+static inline _glptr_TexSubImage3D GET_TexSubImage3D(struct _glapi_table *disp) {
    return (_glptr_TexSubImage3D) (GET_by_offset(disp, _gloffset_TexSubImage3D));
 }
 
-static INLINE void SET_TexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
+static inline void SET_TexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexSubImage3D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyTexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
 #define CALL_CopyTexSubImage3D(disp, parameters) \
     (* GET_CopyTexSubImage3D(disp)) parameters
-static INLINE _glptr_CopyTexSubImage3D GET_CopyTexSubImage3D(struct _glapi_table *disp) {
+static inline _glptr_CopyTexSubImage3D GET_CopyTexSubImage3D(struct _glapi_table *disp) {
    return (_glptr_CopyTexSubImage3D) (GET_by_offset(disp, _gloffset_CopyTexSubImage3D));
 }
 
-static INLINE void SET_CopyTexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
+static inline void SET_CopyTexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_CopyTexSubImage3D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ActiveTextureARB)(GLenum);
 #define CALL_ActiveTextureARB(disp, parameters) \
     (* GET_ActiveTextureARB(disp)) parameters
-static INLINE _glptr_ActiveTextureARB GET_ActiveTextureARB(struct _glapi_table *disp) {
+static inline _glptr_ActiveTextureARB GET_ActiveTextureARB(struct _glapi_table *disp) {
    return (_glptr_ActiveTextureARB) (GET_by_offset(disp, _gloffset_ActiveTextureARB));
 }
 
-static INLINE void SET_ActiveTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ActiveTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ActiveTextureARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClientActiveTextureARB)(GLenum);
 #define CALL_ClientActiveTextureARB(disp, parameters) \
     (* GET_ClientActiveTextureARB(disp)) parameters
-static INLINE _glptr_ClientActiveTextureARB GET_ClientActiveTextureARB(struct _glapi_table *disp) {
+static inline _glptr_ClientActiveTextureARB GET_ClientActiveTextureARB(struct _glapi_table *disp) {
    return (_glptr_ClientActiveTextureARB) (GET_by_offset(disp, _gloffset_ClientActiveTextureARB));
 }
 
-static INLINE void SET_ClientActiveTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ClientActiveTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ClientActiveTextureARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dARB)(GLenum, GLdouble);
 #define CALL_MultiTexCoord1dARB(disp, parameters) \
     (* GET_MultiTexCoord1dARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1dARB GET_MultiTexCoord1dARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1dARB GET_MultiTexCoord1dARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1dARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1dARB));
 }
 
-static INLINE void SET_MultiTexCoord1dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble)) {
+static inline void SET_MultiTexCoord1dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dvARB)(GLenum, const GLdouble *);
 #define CALL_MultiTexCoord1dvARB(disp, parameters) \
     (* GET_MultiTexCoord1dvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1dvARB GET_MultiTexCoord1dvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1dvARB GET_MultiTexCoord1dvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1dvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1dvARB));
 }
 
-static INLINE void SET_MultiTexCoord1dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+static inline void SET_MultiTexCoord1dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fARB)(GLenum, GLfloat);
 #define CALL_MultiTexCoord1fARB(disp, parameters) \
     (* GET_MultiTexCoord1fARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1fARB GET_MultiTexCoord1fARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1fARB GET_MultiTexCoord1fARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1fARB));
 }
 
-static INLINE void SET_MultiTexCoord1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_MultiTexCoord1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fvARB)(GLenum, const GLfloat *);
 #define CALL_MultiTexCoord1fvARB(disp, parameters) \
     (* GET_MultiTexCoord1fvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1fvARB GET_MultiTexCoord1fvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1fvARB GET_MultiTexCoord1fvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1fvARB));
 }
 
-static INLINE void SET_MultiTexCoord1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_MultiTexCoord1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1iARB)(GLenum, GLint);
 #define CALL_MultiTexCoord1iARB(disp, parameters) \
     (* GET_MultiTexCoord1iARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1iARB GET_MultiTexCoord1iARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1iARB GET_MultiTexCoord1iARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1iARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1iARB));
 }
 
-static INLINE void SET_MultiTexCoord1iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_MultiTexCoord1iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1ivARB)(GLenum, const GLint *);
 #define CALL_MultiTexCoord1ivARB(disp, parameters) \
     (* GET_MultiTexCoord1ivARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1ivARB GET_MultiTexCoord1ivARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1ivARB GET_MultiTexCoord1ivARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1ivARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1ivARB));
 }
 
-static INLINE void SET_MultiTexCoord1ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_MultiTexCoord1ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1sARB)(GLenum, GLshort);
 #define CALL_MultiTexCoord1sARB(disp, parameters) \
     (* GET_MultiTexCoord1sARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1sARB GET_MultiTexCoord1sARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1sARB GET_MultiTexCoord1sARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1sARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1sARB));
 }
 
-static INLINE void SET_MultiTexCoord1sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort)) {
+static inline void SET_MultiTexCoord1sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord1svARB)(GLenum, const GLshort *);
 #define CALL_MultiTexCoord1svARB(disp, parameters) \
     (* GET_MultiTexCoord1svARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord1svARB GET_MultiTexCoord1svARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord1svARB GET_MultiTexCoord1svARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord1svARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1svARB));
 }
 
-static INLINE void SET_MultiTexCoord1svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+static inline void SET_MultiTexCoord1svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord1svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dARB)(GLenum, GLdouble, GLdouble);
 #define CALL_MultiTexCoord2dARB(disp, parameters) \
     (* GET_MultiTexCoord2dARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2dARB GET_MultiTexCoord2dARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2dARB GET_MultiTexCoord2dARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2dARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2dARB));
 }
 
-static INLINE void SET_MultiTexCoord2dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble)) {
+static inline void SET_MultiTexCoord2dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dvARB)(GLenum, const GLdouble *);
 #define CALL_MultiTexCoord2dvARB(disp, parameters) \
     (* GET_MultiTexCoord2dvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2dvARB GET_MultiTexCoord2dvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2dvARB GET_MultiTexCoord2dvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2dvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2dvARB));
 }
 
-static INLINE void SET_MultiTexCoord2dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+static inline void SET_MultiTexCoord2dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fARB)(GLenum, GLfloat, GLfloat);
 #define CALL_MultiTexCoord2fARB(disp, parameters) \
     (* GET_MultiTexCoord2fARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2fARB GET_MultiTexCoord2fARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2fARB GET_MultiTexCoord2fARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2fARB));
 }
 
-static INLINE void SET_MultiTexCoord2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat)) {
+static inline void SET_MultiTexCoord2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fvARB)(GLenum, const GLfloat *);
 #define CALL_MultiTexCoord2fvARB(disp, parameters) \
     (* GET_MultiTexCoord2fvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2fvARB GET_MultiTexCoord2fvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2fvARB GET_MultiTexCoord2fvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2fvARB));
 }
 
-static INLINE void SET_MultiTexCoord2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_MultiTexCoord2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2iARB)(GLenum, GLint, GLint);
 #define CALL_MultiTexCoord2iARB(disp, parameters) \
     (* GET_MultiTexCoord2iARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2iARB GET_MultiTexCoord2iARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2iARB GET_MultiTexCoord2iARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2iARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2iARB));
 }
 
-static INLINE void SET_MultiTexCoord2iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) {
+static inline void SET_MultiTexCoord2iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2ivARB)(GLenum, const GLint *);
 #define CALL_MultiTexCoord2ivARB(disp, parameters) \
     (* GET_MultiTexCoord2ivARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2ivARB GET_MultiTexCoord2ivARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2ivARB GET_MultiTexCoord2ivARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2ivARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2ivARB));
 }
 
-static INLINE void SET_MultiTexCoord2ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_MultiTexCoord2ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2sARB)(GLenum, GLshort, GLshort);
 #define CALL_MultiTexCoord2sARB(disp, parameters) \
     (* GET_MultiTexCoord2sARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2sARB GET_MultiTexCoord2sARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2sARB GET_MultiTexCoord2sARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2sARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2sARB));
 }
 
-static INLINE void SET_MultiTexCoord2sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort)) {
+static inline void SET_MultiTexCoord2sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord2svARB)(GLenum, const GLshort *);
 #define CALL_MultiTexCoord2svARB(disp, parameters) \
     (* GET_MultiTexCoord2svARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord2svARB GET_MultiTexCoord2svARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord2svARB GET_MultiTexCoord2svARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord2svARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2svARB));
 }
 
-static INLINE void SET_MultiTexCoord2svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+static inline void SET_MultiTexCoord2svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord2svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dARB)(GLenum, GLdouble, GLdouble, GLdouble);
 #define CALL_MultiTexCoord3dARB(disp, parameters) \
     (* GET_MultiTexCoord3dARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3dARB GET_MultiTexCoord3dARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3dARB GET_MultiTexCoord3dARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3dARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3dARB));
 }
 
-static INLINE void SET_MultiTexCoord3dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_MultiTexCoord3dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dvARB)(GLenum, const GLdouble *);
 #define CALL_MultiTexCoord3dvARB(disp, parameters) \
     (* GET_MultiTexCoord3dvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3dvARB GET_MultiTexCoord3dvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3dvARB GET_MultiTexCoord3dvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3dvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3dvARB));
 }
 
-static INLINE void SET_MultiTexCoord3dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+static inline void SET_MultiTexCoord3dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fARB)(GLenum, GLfloat, GLfloat, GLfloat);
 #define CALL_MultiTexCoord3fARB(disp, parameters) \
     (* GET_MultiTexCoord3fARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3fARB GET_MultiTexCoord3fARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3fARB GET_MultiTexCoord3fARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3fARB));
 }
 
-static INLINE void SET_MultiTexCoord3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_MultiTexCoord3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fvARB)(GLenum, const GLfloat *);
 #define CALL_MultiTexCoord3fvARB(disp, parameters) \
     (* GET_MultiTexCoord3fvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3fvARB GET_MultiTexCoord3fvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3fvARB GET_MultiTexCoord3fvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3fvARB));
 }
 
-static INLINE void SET_MultiTexCoord3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_MultiTexCoord3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3iARB)(GLenum, GLint, GLint, GLint);
 #define CALL_MultiTexCoord3iARB(disp, parameters) \
     (* GET_MultiTexCoord3iARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3iARB GET_MultiTexCoord3iARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3iARB GET_MultiTexCoord3iARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3iARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3iARB));
 }
 
-static INLINE void SET_MultiTexCoord3iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint)) {
+static inline void SET_MultiTexCoord3iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3ivARB)(GLenum, const GLint *);
 #define CALL_MultiTexCoord3ivARB(disp, parameters) \
     (* GET_MultiTexCoord3ivARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3ivARB GET_MultiTexCoord3ivARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3ivARB GET_MultiTexCoord3ivARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3ivARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3ivARB));
 }
 
-static INLINE void SET_MultiTexCoord3ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_MultiTexCoord3ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3sARB)(GLenum, GLshort, GLshort, GLshort);
 #define CALL_MultiTexCoord3sARB(disp, parameters) \
     (* GET_MultiTexCoord3sARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3sARB GET_MultiTexCoord3sARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3sARB GET_MultiTexCoord3sARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3sARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3sARB));
 }
 
-static INLINE void SET_MultiTexCoord3sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort)) {
+static inline void SET_MultiTexCoord3sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord3svARB)(GLenum, const GLshort *);
 #define CALL_MultiTexCoord3svARB(disp, parameters) \
     (* GET_MultiTexCoord3svARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord3svARB GET_MultiTexCoord3svARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord3svARB GET_MultiTexCoord3svARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord3svARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3svARB));
 }
 
-static INLINE void SET_MultiTexCoord3svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+static inline void SET_MultiTexCoord3svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord3svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dARB)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_MultiTexCoord4dARB(disp, parameters) \
     (* GET_MultiTexCoord4dARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4dARB GET_MultiTexCoord4dARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4dARB GET_MultiTexCoord4dARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4dARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4dARB));
 }
 
-static INLINE void SET_MultiTexCoord4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_MultiTexCoord4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dvARB)(GLenum, const GLdouble *);
 #define CALL_MultiTexCoord4dvARB(disp, parameters) \
     (* GET_MultiTexCoord4dvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4dvARB GET_MultiTexCoord4dvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4dvARB GET_MultiTexCoord4dvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4dvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4dvARB));
 }
 
-static INLINE void SET_MultiTexCoord4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+static inline void SET_MultiTexCoord4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fARB)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_MultiTexCoord4fARB(disp, parameters) \
     (* GET_MultiTexCoord4fARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4fARB GET_MultiTexCoord4fARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4fARB GET_MultiTexCoord4fARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4fARB));
 }
 
-static INLINE void SET_MultiTexCoord4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_MultiTexCoord4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fvARB)(GLenum, const GLfloat *);
 #define CALL_MultiTexCoord4fvARB(disp, parameters) \
     (* GET_MultiTexCoord4fvARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4fvARB GET_MultiTexCoord4fvARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4fvARB GET_MultiTexCoord4fvARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4fvARB));
 }
 
-static INLINE void SET_MultiTexCoord4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_MultiTexCoord4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4iARB)(GLenum, GLint, GLint, GLint, GLint);
 #define CALL_MultiTexCoord4iARB(disp, parameters) \
     (* GET_MultiTexCoord4iARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4iARB GET_MultiTexCoord4iARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4iARB GET_MultiTexCoord4iARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4iARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4iARB));
 }
 
-static INLINE void SET_MultiTexCoord4iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) {
+static inline void SET_MultiTexCoord4iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4ivARB)(GLenum, const GLint *);
 #define CALL_MultiTexCoord4ivARB(disp, parameters) \
     (* GET_MultiTexCoord4ivARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4ivARB GET_MultiTexCoord4ivARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4ivARB GET_MultiTexCoord4ivARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4ivARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4ivARB));
 }
 
-static INLINE void SET_MultiTexCoord4ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_MultiTexCoord4ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4sARB)(GLenum, GLshort, GLshort, GLshort, GLshort);
 #define CALL_MultiTexCoord4sARB(disp, parameters) \
     (* GET_MultiTexCoord4sARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4sARB GET_MultiTexCoord4sARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4sARB GET_MultiTexCoord4sARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4sARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4sARB));
 }
 
-static INLINE void SET_MultiTexCoord4sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_MultiTexCoord4sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoord4svARB)(GLenum, const GLshort *);
 #define CALL_MultiTexCoord4svARB(disp, parameters) \
     (* GET_MultiTexCoord4svARB(disp)) parameters
-static INLINE _glptr_MultiTexCoord4svARB GET_MultiTexCoord4svARB(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoord4svARB GET_MultiTexCoord4svARB(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoord4svARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4svARB));
 }
 
-static INLINE void SET_MultiTexCoord4svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+static inline void SET_MultiTexCoord4svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoord4svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_AttachShader)(GLuint, GLuint);
 #define CALL_AttachShader(disp, parameters) \
     (* GET_AttachShader(disp)) parameters
-static INLINE _glptr_AttachShader GET_AttachShader(struct _glapi_table *disp) {
+static inline _glptr_AttachShader GET_AttachShader(struct _glapi_table *disp) {
    return (_glptr_AttachShader) (GET_by_offset(disp, _gloffset_AttachShader));
 }
 
-static INLINE void SET_AttachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+static inline void SET_AttachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_AttachShader, fn);
 }
 
 typedef GLuint (GLAPIENTRYP _glptr_CreateProgram)(void);
 #define CALL_CreateProgram(disp, parameters) \
     (* GET_CreateProgram(disp)) parameters
-static INLINE _glptr_CreateProgram GET_CreateProgram(struct _glapi_table *disp) {
+static inline _glptr_CreateProgram GET_CreateProgram(struct _glapi_table *disp) {
    return (_glptr_CreateProgram) (GET_by_offset(disp, _gloffset_CreateProgram));
 }
 
-static INLINE void SET_CreateProgram(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(void)) {
+static inline void SET_CreateProgram(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_CreateProgram, fn);
 }
 
 typedef GLuint (GLAPIENTRYP _glptr_CreateShader)(GLenum);
 #define CALL_CreateShader(disp, parameters) \
     (* GET_CreateShader(disp)) parameters
-static INLINE _glptr_CreateShader GET_CreateShader(struct _glapi_table *disp) {
+static inline _glptr_CreateShader GET_CreateShader(struct _glapi_table *disp) {
    return (_glptr_CreateShader) (GET_by_offset(disp, _gloffset_CreateShader));
 }
 
-static INLINE void SET_CreateShader(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_CreateShader(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_CreateShader, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteProgram)(GLuint);
 #define CALL_DeleteProgram(disp, parameters) \
     (* GET_DeleteProgram(disp)) parameters
-static INLINE _glptr_DeleteProgram GET_DeleteProgram(struct _glapi_table *disp) {
+static inline _glptr_DeleteProgram GET_DeleteProgram(struct _glapi_table *disp) {
    return (_glptr_DeleteProgram) (GET_by_offset(disp, _gloffset_DeleteProgram));
 }
 
-static INLINE void SET_DeleteProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_DeleteProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_DeleteProgram, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteShader)(GLuint);
 #define CALL_DeleteShader(disp, parameters) \
     (* GET_DeleteShader(disp)) parameters
-static INLINE _glptr_DeleteShader GET_DeleteShader(struct _glapi_table *disp) {
+static inline _glptr_DeleteShader GET_DeleteShader(struct _glapi_table *disp) {
    return (_glptr_DeleteShader) (GET_by_offset(disp, _gloffset_DeleteShader));
 }
 
-static INLINE void SET_DeleteShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_DeleteShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_DeleteShader, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DetachShader)(GLuint, GLuint);
 #define CALL_DetachShader(disp, parameters) \
     (* GET_DetachShader(disp)) parameters
-static INLINE _glptr_DetachShader GET_DetachShader(struct _glapi_table *disp) {
+static inline _glptr_DetachShader GET_DetachShader(struct _glapi_table *disp) {
    return (_glptr_DetachShader) (GET_by_offset(disp, _gloffset_DetachShader));
 }
 
-static INLINE void SET_DetachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+static inline void SET_DetachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_DetachShader, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetAttachedShaders)(GLuint, GLsizei, GLsizei *, GLuint *);
 #define CALL_GetAttachedShaders(disp, parameters) \
     (* GET_GetAttachedShaders(disp)) parameters
-static INLINE _glptr_GetAttachedShaders GET_GetAttachedShaders(struct _glapi_table *disp) {
+static inline _glptr_GetAttachedShaders GET_GetAttachedShaders(struct _glapi_table *disp) {
    return (_glptr_GetAttachedShaders) (GET_by_offset(disp, _gloffset_GetAttachedShaders));
 }
 
-static INLINE void SET_GetAttachedShaders(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLuint *)) {
+static inline void SET_GetAttachedShaders(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetAttachedShaders, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
 #define CALL_GetProgramInfoLog(disp, parameters) \
     (* GET_GetProgramInfoLog(disp)) parameters
-static INLINE _glptr_GetProgramInfoLog GET_GetProgramInfoLog(struct _glapi_table *disp) {
+static inline _glptr_GetProgramInfoLog GET_GetProgramInfoLog(struct _glapi_table *disp) {
    return (_glptr_GetProgramInfoLog) (GET_by_offset(disp, _gloffset_GetProgramInfoLog));
 }
 
-static INLINE void SET_GetProgramInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) {
+static inline void SET_GetProgramInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) {
    SET_by_offset(disp, _gloffset_GetProgramInfoLog, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramiv)(GLuint, GLenum, GLint *);
 #define CALL_GetProgramiv(disp, parameters) \
     (* GET_GetProgramiv(disp)) parameters
-static INLINE _glptr_GetProgramiv GET_GetProgramiv(struct _glapi_table *disp) {
+static inline _glptr_GetProgramiv GET_GetProgramiv(struct _glapi_table *disp) {
    return (_glptr_GetProgramiv) (GET_by_offset(disp, _gloffset_GetProgramiv));
 }
 
-static INLINE void SET_GetProgramiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetProgramiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetProgramiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
 #define CALL_GetShaderInfoLog(disp, parameters) \
     (* GET_GetShaderInfoLog(disp)) parameters
-static INLINE _glptr_GetShaderInfoLog GET_GetShaderInfoLog(struct _glapi_table *disp) {
+static inline _glptr_GetShaderInfoLog GET_GetShaderInfoLog(struct _glapi_table *disp) {
    return (_glptr_GetShaderInfoLog) (GET_by_offset(disp, _gloffset_GetShaderInfoLog));
 }
 
-static INLINE void SET_GetShaderInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) {
+static inline void SET_GetShaderInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) {
    SET_by_offset(disp, _gloffset_GetShaderInfoLog, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetShaderiv)(GLuint, GLenum, GLint *);
 #define CALL_GetShaderiv(disp, parameters) \
     (* GET_GetShaderiv(disp)) parameters
-static INLINE _glptr_GetShaderiv GET_GetShaderiv(struct _glapi_table *disp) {
+static inline _glptr_GetShaderiv GET_GetShaderiv(struct _glapi_table *disp) {
    return (_glptr_GetShaderiv) (GET_by_offset(disp, _gloffset_GetShaderiv));
 }
 
-static INLINE void SET_GetShaderiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetShaderiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetShaderiv, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsProgram)(GLuint);
 #define CALL_IsProgram(disp, parameters) \
     (* GET_IsProgram(disp)) parameters
-static INLINE _glptr_IsProgram GET_IsProgram(struct _glapi_table *disp) {
+static inline _glptr_IsProgram GET_IsProgram(struct _glapi_table *disp) {
    return (_glptr_IsProgram) (GET_by_offset(disp, _gloffset_IsProgram));
 }
 
-static INLINE void SET_IsProgram(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsProgram(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsProgram, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsShader)(GLuint);
 #define CALL_IsShader(disp, parameters) \
     (* GET_IsShader(disp)) parameters
-static INLINE _glptr_IsShader GET_IsShader(struct _glapi_table *disp) {
+static inline _glptr_IsShader GET_IsShader(struct _glapi_table *disp) {
    return (_glptr_IsShader) (GET_by_offset(disp, _gloffset_IsShader));
 }
 
-static INLINE void SET_IsShader(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsShader(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsShader, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilFuncSeparate)(GLenum, GLenum, GLint, GLuint);
 #define CALL_StencilFuncSeparate(disp, parameters) \
     (* GET_StencilFuncSeparate(disp)) parameters
-static INLINE _glptr_StencilFuncSeparate GET_StencilFuncSeparate(struct _glapi_table *disp) {
+static inline _glptr_StencilFuncSeparate GET_StencilFuncSeparate(struct _glapi_table *disp) {
    return (_glptr_StencilFuncSeparate) (GET_by_offset(disp, _gloffset_StencilFuncSeparate));
 }
 
-static INLINE void SET_StencilFuncSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLuint)) {
+static inline void SET_StencilFuncSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLuint)) {
    SET_by_offset(disp, _gloffset_StencilFuncSeparate, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilMaskSeparate)(GLenum, GLuint);
 #define CALL_StencilMaskSeparate(disp, parameters) \
     (* GET_StencilMaskSeparate(disp)) parameters
-static INLINE _glptr_StencilMaskSeparate GET_StencilMaskSeparate(struct _glapi_table *disp) {
+static inline _glptr_StencilMaskSeparate GET_StencilMaskSeparate(struct _glapi_table *disp) {
    return (_glptr_StencilMaskSeparate) (GET_by_offset(disp, _gloffset_StencilMaskSeparate));
 }
 
-static INLINE void SET_StencilMaskSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_StencilMaskSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_StencilMaskSeparate, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilOpSeparate)(GLenum, GLenum, GLenum, GLenum);
 #define CALL_StencilOpSeparate(disp, parameters) \
     (* GET_StencilOpSeparate(disp)) parameters
-static INLINE _glptr_StencilOpSeparate GET_StencilOpSeparate(struct _glapi_table *disp) {
+static inline _glptr_StencilOpSeparate GET_StencilOpSeparate(struct _glapi_table *disp) {
    return (_glptr_StencilOpSeparate) (GET_by_offset(disp, _gloffset_StencilOpSeparate));
 }
 
-static INLINE void SET_StencilOpSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
+static inline void SET_StencilOpSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_StencilOpSeparate, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix2x3fv)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix2x3fv(disp, parameters) \
     (* GET_UniformMatrix2x3fv(disp)) parameters
-static INLINE _glptr_UniformMatrix2x3fv GET_UniformMatrix2x3fv(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix2x3fv GET_UniformMatrix2x3fv(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix2x3fv) (GET_by_offset(disp, _gloffset_UniformMatrix2x3fv));
 }
 
-static INLINE void SET_UniformMatrix2x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix2x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix2x3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix2x4fv)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix2x4fv(disp, parameters) \
     (* GET_UniformMatrix2x4fv(disp)) parameters
-static INLINE _glptr_UniformMatrix2x4fv GET_UniformMatrix2x4fv(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix2x4fv GET_UniformMatrix2x4fv(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix2x4fv) (GET_by_offset(disp, _gloffset_UniformMatrix2x4fv));
 }
 
-static INLINE void SET_UniformMatrix2x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix2x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix2x4fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix3x2fv)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix3x2fv(disp, parameters) \
     (* GET_UniformMatrix3x2fv(disp)) parameters
-static INLINE _glptr_UniformMatrix3x2fv GET_UniformMatrix3x2fv(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix3x2fv GET_UniformMatrix3x2fv(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix3x2fv) (GET_by_offset(disp, _gloffset_UniformMatrix3x2fv));
 }
 
-static INLINE void SET_UniformMatrix3x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix3x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix3x2fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix3x4fv)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix3x4fv(disp, parameters) \
     (* GET_UniformMatrix3x4fv(disp)) parameters
-static INLINE _glptr_UniformMatrix3x4fv GET_UniformMatrix3x4fv(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix3x4fv GET_UniformMatrix3x4fv(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix3x4fv) (GET_by_offset(disp, _gloffset_UniformMatrix3x4fv));
 }
 
-static INLINE void SET_UniformMatrix3x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix3x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix3x4fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix4x2fv)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix4x2fv(disp, parameters) \
     (* GET_UniformMatrix4x2fv(disp)) parameters
-static INLINE _glptr_UniformMatrix4x2fv GET_UniformMatrix4x2fv(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix4x2fv GET_UniformMatrix4x2fv(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix4x2fv) (GET_by_offset(disp, _gloffset_UniformMatrix4x2fv));
 }
 
-static INLINE void SET_UniformMatrix4x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix4x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix4x2fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix4x3fv)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix4x3fv(disp, parameters) \
     (* GET_UniformMatrix4x3fv(disp)) parameters
-static INLINE _glptr_UniformMatrix4x3fv GET_UniformMatrix4x3fv(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix4x3fv GET_UniformMatrix4x3fv(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix4x3fv) (GET_by_offset(disp, _gloffset_UniformMatrix4x3fv));
 }
 
-static INLINE void SET_UniformMatrix4x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix4x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix4x3fv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClampColor)(GLenum, GLenum);
 #define CALL_ClampColor(disp, parameters) \
     (* GET_ClampColor(disp)) parameters
-static INLINE _glptr_ClampColor GET_ClampColor(struct _glapi_table *disp) {
+static inline _glptr_ClampColor GET_ClampColor(struct _glapi_table *disp) {
    return (_glptr_ClampColor) (GET_by_offset(disp, _gloffset_ClampColor));
 }
 
-static INLINE void SET_ClampColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_ClampColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_ClampColor, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearBufferfi)(GLenum, GLint, GLfloat, GLint);
 #define CALL_ClearBufferfi(disp, parameters) \
     (* GET_ClearBufferfi(disp)) parameters
-static INLINE _glptr_ClearBufferfi GET_ClearBufferfi(struct _glapi_table *disp) {
+static inline _glptr_ClearBufferfi GET_ClearBufferfi(struct _glapi_table *disp) {
    return (_glptr_ClearBufferfi) (GET_by_offset(disp, _gloffset_ClearBufferfi));
 }
 
-static INLINE void SET_ClearBufferfi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLfloat, GLint)) {
+static inline void SET_ClearBufferfi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLfloat, GLint)) {
    SET_by_offset(disp, _gloffset_ClearBufferfi, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearBufferfv)(GLenum, GLint, const GLfloat *);
 #define CALL_ClearBufferfv(disp, parameters) \
     (* GET_ClearBufferfv(disp)) parameters
-static INLINE _glptr_ClearBufferfv GET_ClearBufferfv(struct _glapi_table *disp) {
+static inline _glptr_ClearBufferfv GET_ClearBufferfv(struct _glapi_table *disp) {
    return (_glptr_ClearBufferfv) (GET_by_offset(disp, _gloffset_ClearBufferfv));
 }
 
-static INLINE void SET_ClearBufferfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLfloat *)) {
+static inline void SET_ClearBufferfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ClearBufferfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearBufferiv)(GLenum, GLint, const GLint *);
 #define CALL_ClearBufferiv(disp, parameters) \
     (* GET_ClearBufferiv(disp)) parameters
-static INLINE _glptr_ClearBufferiv GET_ClearBufferiv(struct _glapi_table *disp) {
+static inline _glptr_ClearBufferiv GET_ClearBufferiv(struct _glapi_table *disp) {
    return (_glptr_ClearBufferiv) (GET_by_offset(disp, _gloffset_ClearBufferiv));
 }
 
-static INLINE void SET_ClearBufferiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLint *)) {
+static inline void SET_ClearBufferiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLint *)) {
    SET_by_offset(disp, _gloffset_ClearBufferiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearBufferuiv)(GLenum, GLint, const GLuint *);
 #define CALL_ClearBufferuiv(disp, parameters) \
     (* GET_ClearBufferuiv(disp)) parameters
-static INLINE _glptr_ClearBufferuiv GET_ClearBufferuiv(struct _glapi_table *disp) {
+static inline _glptr_ClearBufferuiv GET_ClearBufferuiv(struct _glapi_table *disp) {
    return (_glptr_ClearBufferuiv) (GET_by_offset(disp, _gloffset_ClearBufferuiv));
 }
 
-static INLINE void SET_ClearBufferuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLuint *)) {
+static inline void SET_ClearBufferuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_ClearBufferuiv, fn);
 }
 
 typedef const GLubyte * (GLAPIENTRYP _glptr_GetStringi)(GLenum, GLuint);
 #define CALL_GetStringi(disp, parameters) \
     (* GET_GetStringi(disp)) parameters
-static INLINE _glptr_GetStringi GET_GetStringi(struct _glapi_table *disp) {
+static inline _glptr_GetStringi GET_GetStringi(struct _glapi_table *disp) {
    return (_glptr_GetStringi) (GET_by_offset(disp, _gloffset_GetStringi));
 }
 
-static INLINE void SET_GetStringi(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_GetStringi(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_GetStringi, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexBuffer)(GLenum, GLenum, GLuint);
 #define CALL_TexBuffer(disp, parameters) \
     (* GET_TexBuffer(disp)) parameters
-static INLINE _glptr_TexBuffer GET_TexBuffer(struct _glapi_table *disp) {
+static inline _glptr_TexBuffer GET_TexBuffer(struct _glapi_table *disp) {
    return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer));
 }
 
-static INLINE void SET_TexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+static inline void SET_TexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_TexBuffer, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTexture)(GLenum, GLenum, GLuint, GLint);
 #define CALL_FramebufferTexture(disp, parameters) \
     (* GET_FramebufferTexture(disp)) parameters
-static INLINE _glptr_FramebufferTexture GET_FramebufferTexture(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTexture GET_FramebufferTexture(struct _glapi_table *disp) {
    return (_glptr_FramebufferTexture) (GET_by_offset(disp, _gloffset_FramebufferTexture));
 }
 
-static INLINE void SET_FramebufferTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) {
+static inline void SET_FramebufferTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) {
    SET_by_offset(disp, _gloffset_FramebufferTexture, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetBufferParameteri64v)(GLenum, GLenum, GLint64 *);
 #define CALL_GetBufferParameteri64v(disp, parameters) \
     (* GET_GetBufferParameteri64v(disp)) parameters
-static INLINE _glptr_GetBufferParameteri64v GET_GetBufferParameteri64v(struct _glapi_table *disp) {
+static inline _glptr_GetBufferParameteri64v GET_GetBufferParameteri64v(struct _glapi_table *disp) {
    return (_glptr_GetBufferParameteri64v) (GET_by_offset(disp, _gloffset_GetBufferParameteri64v));
 }
 
-static INLINE void SET_GetBufferParameteri64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint64 *)) {
+static inline void SET_GetBufferParameteri64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint64 *)) {
    SET_by_offset(disp, _gloffset_GetBufferParameteri64v, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetInteger64i_v)(GLenum, GLuint, GLint64 *);
 #define CALL_GetInteger64i_v(disp, parameters) \
     (* GET_GetInteger64i_v(disp)) parameters
-static INLINE _glptr_GetInteger64i_v GET_GetInteger64i_v(struct _glapi_table *disp) {
+static inline _glptr_GetInteger64i_v GET_GetInteger64i_v(struct _glapi_table *disp) {
    return (_glptr_GetInteger64i_v) (GET_by_offset(disp, _gloffset_GetInteger64i_v));
 }
 
-static INLINE void SET_GetInteger64i_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint64 *)) {
+static inline void SET_GetInteger64i_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint64 *)) {
    SET_by_offset(disp, _gloffset_GetInteger64i_v, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor)(GLuint, GLuint);
 #define CALL_VertexAttribDivisor(disp, parameters) \
     (* GET_VertexAttribDivisor(disp)) parameters
-static INLINE _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table *disp) {
    return (_glptr_VertexAttribDivisor) (GET_by_offset(disp, _gloffset_VertexAttribDivisor));
 }
 
-static INLINE void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+static inline void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixdARB)(const GLdouble *);
 #define CALL_LoadTransposeMatrixdARB(disp, parameters) \
     (* GET_LoadTransposeMatrixdARB(disp)) parameters
-static INLINE _glptr_LoadTransposeMatrixdARB GET_LoadTransposeMatrixdARB(struct _glapi_table *disp) {
+static inline _glptr_LoadTransposeMatrixdARB GET_LoadTransposeMatrixdARB(struct _glapi_table *disp) {
    return (_glptr_LoadTransposeMatrixdARB) (GET_by_offset(disp, _gloffset_LoadTransposeMatrixdARB));
 }
 
-static INLINE void SET_LoadTransposeMatrixdARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_LoadTransposeMatrixdARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_LoadTransposeMatrixdARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixfARB)(const GLfloat *);
 #define CALL_LoadTransposeMatrixfARB(disp, parameters) \
     (* GET_LoadTransposeMatrixfARB(disp)) parameters
-static INLINE _glptr_LoadTransposeMatrixfARB GET_LoadTransposeMatrixfARB(struct _glapi_table *disp) {
+static inline _glptr_LoadTransposeMatrixfARB GET_LoadTransposeMatrixfARB(struct _glapi_table *disp) {
    return (_glptr_LoadTransposeMatrixfARB) (GET_by_offset(disp, _gloffset_LoadTransposeMatrixfARB));
 }
 
-static INLINE void SET_LoadTransposeMatrixfARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_LoadTransposeMatrixfARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_LoadTransposeMatrixfARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixdARB)(const GLdouble *);
 #define CALL_MultTransposeMatrixdARB(disp, parameters) \
     (* GET_MultTransposeMatrixdARB(disp)) parameters
-static INLINE _glptr_MultTransposeMatrixdARB GET_MultTransposeMatrixdARB(struct _glapi_table *disp) {
+static inline _glptr_MultTransposeMatrixdARB GET_MultTransposeMatrixdARB(struct _glapi_table *disp) {
    return (_glptr_MultTransposeMatrixdARB) (GET_by_offset(disp, _gloffset_MultTransposeMatrixdARB));
 }
 
-static INLINE void SET_MultTransposeMatrixdARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_MultTransposeMatrixdARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_MultTransposeMatrixdARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixfARB)(const GLfloat *);
 #define CALL_MultTransposeMatrixfARB(disp, parameters) \
     (* GET_MultTransposeMatrixfARB(disp)) parameters
-static INLINE _glptr_MultTransposeMatrixfARB GET_MultTransposeMatrixfARB(struct _glapi_table *disp) {
+static inline _glptr_MultTransposeMatrixfARB GET_MultTransposeMatrixfARB(struct _glapi_table *disp) {
    return (_glptr_MultTransposeMatrixfARB) (GET_by_offset(disp, _gloffset_MultTransposeMatrixfARB));
 }
 
-static INLINE void SET_MultTransposeMatrixfARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_MultTransposeMatrixfARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_MultTransposeMatrixfARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SampleCoverageARB)(GLclampf, GLboolean);
 #define CALL_SampleCoverageARB(disp, parameters) \
     (* GET_SampleCoverageARB(disp)) parameters
-static INLINE _glptr_SampleCoverageARB GET_SampleCoverageARB(struct _glapi_table *disp) {
+static inline _glptr_SampleCoverageARB GET_SampleCoverageARB(struct _glapi_table *disp) {
    return (_glptr_SampleCoverageARB) (GET_by_offset(disp, _gloffset_SampleCoverageARB));
 }
 
-static INLINE void SET_SampleCoverageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) {
+static inline void SET_SampleCoverageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) {
    SET_by_offset(disp, _gloffset_SampleCoverageARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompressedTexImage1DARB)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
 #define CALL_CompressedTexImage1DARB(disp, parameters) \
     (* GET_CompressedTexImage1DARB(disp)) parameters
-static INLINE _glptr_CompressedTexImage1DARB GET_CompressedTexImage1DARB(struct _glapi_table *disp) {
+static inline _glptr_CompressedTexImage1DARB GET_CompressedTexImage1DARB(struct _glapi_table *disp) {
    return (_glptr_CompressedTexImage1DARB) (GET_by_offset(disp, _gloffset_CompressedTexImage1DARB));
 }
 
-static INLINE void SET_CompressedTexImage1DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *)) {
+static inline void SET_CompressedTexImage1DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CompressedTexImage1DARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompressedTexImage2DARB)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
 #define CALL_CompressedTexImage2DARB(disp, parameters) \
     (* GET_CompressedTexImage2DARB(disp)) parameters
-static INLINE _glptr_CompressedTexImage2DARB GET_CompressedTexImage2DARB(struct _glapi_table *disp) {
+static inline _glptr_CompressedTexImage2DARB GET_CompressedTexImage2DARB(struct _glapi_table *disp) {
    return (_glptr_CompressedTexImage2DARB) (GET_by_offset(disp, _gloffset_CompressedTexImage2DARB));
 }
 
-static INLINE void SET_CompressedTexImage2DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) {
+static inline void SET_CompressedTexImage2DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CompressedTexImage2DARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompressedTexImage3DARB)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
 #define CALL_CompressedTexImage3DARB(disp, parameters) \
     (* GET_CompressedTexImage3DARB(disp)) parameters
-static INLINE _glptr_CompressedTexImage3DARB GET_CompressedTexImage3DARB(struct _glapi_table *disp) {
+static inline _glptr_CompressedTexImage3DARB GET_CompressedTexImage3DARB(struct _glapi_table *disp) {
    return (_glptr_CompressedTexImage3DARB) (GET_by_offset(disp, _gloffset_CompressedTexImage3DARB));
 }
 
-static INLINE void SET_CompressedTexImage3DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) {
+static inline void SET_CompressedTexImage3DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CompressedTexImage3DARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage1DARB)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
 #define CALL_CompressedTexSubImage1DARB(disp, parameters) \
     (* GET_CompressedTexSubImage1DARB(disp)) parameters
-static INLINE _glptr_CompressedTexSubImage1DARB GET_CompressedTexSubImage1DARB(struct _glapi_table *disp) {
+static inline _glptr_CompressedTexSubImage1DARB GET_CompressedTexSubImage1DARB(struct _glapi_table *disp) {
    return (_glptr_CompressedTexSubImage1DARB) (GET_by_offset(disp, _gloffset_CompressedTexSubImage1DARB));
 }
 
-static INLINE void SET_CompressedTexSubImage1DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_CompressedTexSubImage1DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CompressedTexSubImage1DARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage2DARB)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
 #define CALL_CompressedTexSubImage2DARB(disp, parameters) \
     (* GET_CompressedTexSubImage2DARB(disp)) parameters
-static INLINE _glptr_CompressedTexSubImage2DARB GET_CompressedTexSubImage2DARB(struct _glapi_table *disp) {
+static inline _glptr_CompressedTexSubImage2DARB GET_CompressedTexSubImage2DARB(struct _glapi_table *disp) {
    return (_glptr_CompressedTexSubImage2DARB) (GET_by_offset(disp, _gloffset_CompressedTexSubImage2DARB));
 }
 
-static INLINE void SET_CompressedTexSubImage2DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_CompressedTexSubImage2DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CompressedTexSubImage2DARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage3DARB)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
 #define CALL_CompressedTexSubImage3DARB(disp, parameters) \
     (* GET_CompressedTexSubImage3DARB(disp)) parameters
-static INLINE _glptr_CompressedTexSubImage3DARB GET_CompressedTexSubImage3DARB(struct _glapi_table *disp) {
+static inline _glptr_CompressedTexSubImage3DARB GET_CompressedTexSubImage3DARB(struct _glapi_table *disp) {
    return (_glptr_CompressedTexSubImage3DARB) (GET_by_offset(disp, _gloffset_CompressedTexSubImage3DARB));
 }
 
-static INLINE void SET_CompressedTexSubImage3DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_CompressedTexSubImage3DARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_CompressedTexSubImage3DARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetCompressedTexImageARB)(GLenum, GLint, GLvoid *);
 #define CALL_GetCompressedTexImageARB(disp, parameters) \
     (* GET_GetCompressedTexImageARB(disp)) parameters
-static INLINE _glptr_GetCompressedTexImageARB GET_GetCompressedTexImageARB(struct _glapi_table *disp) {
+static inline _glptr_GetCompressedTexImageARB GET_GetCompressedTexImageARB(struct _glapi_table *disp) {
    return (_glptr_GetCompressedTexImageARB) (GET_by_offset(disp, _gloffset_GetCompressedTexImageARB));
 }
 
-static INLINE void SET_GetCompressedTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLvoid *)) {
+static inline void SET_GetCompressedTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetCompressedTexImageARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DisableVertexAttribArrayARB)(GLuint);
 #define CALL_DisableVertexAttribArrayARB(disp, parameters) \
     (* GET_DisableVertexAttribArrayARB(disp)) parameters
-static INLINE _glptr_DisableVertexAttribArrayARB GET_DisableVertexAttribArrayARB(struct _glapi_table *disp) {
+static inline _glptr_DisableVertexAttribArrayARB GET_DisableVertexAttribArrayARB(struct _glapi_table *disp) {
    return (_glptr_DisableVertexAttribArrayARB) (GET_by_offset(disp, _gloffset_DisableVertexAttribArrayARB));
 }
 
-static INLINE void SET_DisableVertexAttribArrayARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_DisableVertexAttribArrayARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_DisableVertexAttribArrayARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EnableVertexAttribArrayARB)(GLuint);
 #define CALL_EnableVertexAttribArrayARB(disp, parameters) \
     (* GET_EnableVertexAttribArrayARB(disp)) parameters
-static INLINE _glptr_EnableVertexAttribArrayARB GET_EnableVertexAttribArrayARB(struct _glapi_table *disp) {
+static inline _glptr_EnableVertexAttribArrayARB GET_EnableVertexAttribArrayARB(struct _glapi_table *disp) {
    return (_glptr_EnableVertexAttribArrayARB) (GET_by_offset(disp, _gloffset_EnableVertexAttribArrayARB));
 }
 
-static INLINE void SET_EnableVertexAttribArrayARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_EnableVertexAttribArrayARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_EnableVertexAttribArrayARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterdvARB)(GLenum, GLuint, GLdouble *);
 #define CALL_GetProgramEnvParameterdvARB(disp, parameters) \
     (* GET_GetProgramEnvParameterdvARB(disp)) parameters
-static INLINE _glptr_GetProgramEnvParameterdvARB GET_GetProgramEnvParameterdvARB(struct _glapi_table *disp) {
+static inline _glptr_GetProgramEnvParameterdvARB GET_GetProgramEnvParameterdvARB(struct _glapi_table *disp) {
    return (_glptr_GetProgramEnvParameterdvARB) (GET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB));
 }
 
-static INLINE void SET_GetProgramEnvParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) {
+static inline void SET_GetProgramEnvParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterfvARB)(GLenum, GLuint, GLfloat *);
 #define CALL_GetProgramEnvParameterfvARB(disp, parameters) \
     (* GET_GetProgramEnvParameterfvARB(disp)) parameters
-static INLINE _glptr_GetProgramEnvParameterfvARB GET_GetProgramEnvParameterfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetProgramEnvParameterfvARB GET_GetProgramEnvParameterfvARB(struct _glapi_table *disp) {
    return (_glptr_GetProgramEnvParameterfvARB) (GET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB));
 }
 
-static INLINE void SET_GetProgramEnvParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) {
+static inline void SET_GetProgramEnvParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterdvARB)(GLenum, GLuint, GLdouble *);
 #define CALL_GetProgramLocalParameterdvARB(disp, parameters) \
     (* GET_GetProgramLocalParameterdvARB(disp)) parameters
-static INLINE _glptr_GetProgramLocalParameterdvARB GET_GetProgramLocalParameterdvARB(struct _glapi_table *disp) {
+static inline _glptr_GetProgramLocalParameterdvARB GET_GetProgramLocalParameterdvARB(struct _glapi_table *disp) {
    return (_glptr_GetProgramLocalParameterdvARB) (GET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB));
 }
 
-static INLINE void SET_GetProgramLocalParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) {
+static inline void SET_GetProgramLocalParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterfvARB)(GLenum, GLuint, GLfloat *);
 #define CALL_GetProgramLocalParameterfvARB(disp, parameters) \
     (* GET_GetProgramLocalParameterfvARB(disp)) parameters
-static INLINE _glptr_GetProgramLocalParameterfvARB GET_GetProgramLocalParameterfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetProgramLocalParameterfvARB GET_GetProgramLocalParameterfvARB(struct _glapi_table *disp) {
    return (_glptr_GetProgramLocalParameterfvARB) (GET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB));
 }
 
-static INLINE void SET_GetProgramLocalParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) {
+static inline void SET_GetProgramLocalParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramStringARB)(GLenum, GLenum, GLvoid *);
 #define CALL_GetProgramStringARB(disp, parameters) \
     (* GET_GetProgramStringARB(disp)) parameters
-static INLINE _glptr_GetProgramStringARB GET_GetProgramStringARB(struct _glapi_table *disp) {
+static inline _glptr_GetProgramStringARB GET_GetProgramStringARB(struct _glapi_table *disp) {
    return (_glptr_GetProgramStringARB) (GET_by_offset(disp, _gloffset_GetProgramStringARB));
 }
 
-static INLINE void SET_GetProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid *)) {
+static inline void SET_GetProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetProgramStringARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramivARB)(GLenum, GLenum, GLint *);
 #define CALL_GetProgramivARB(disp, parameters) \
     (* GET_GetProgramivARB(disp)) parameters
-static INLINE _glptr_GetProgramivARB GET_GetProgramivARB(struct _glapi_table *disp) {
+static inline _glptr_GetProgramivARB GET_GetProgramivARB(struct _glapi_table *disp) {
    return (_glptr_GetProgramivARB) (GET_by_offset(disp, _gloffset_GetProgramivARB));
 }
 
-static INLINE void SET_GetProgramivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetProgramivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetProgramivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvARB)(GLuint, GLenum, GLdouble *);
 #define CALL_GetVertexAttribdvARB(disp, parameters) \
     (* GET_GetVertexAttribdvARB(disp)) parameters
-static INLINE _glptr_GetVertexAttribdvARB GET_GetVertexAttribdvARB(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribdvARB GET_GetVertexAttribdvARB(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribdvARB) (GET_by_offset(disp, _gloffset_GetVertexAttribdvARB));
 }
 
-static INLINE void SET_GetVertexAttribdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) {
+static inline void SET_GetVertexAttribdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribdvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvARB)(GLuint, GLenum, GLfloat *);
 #define CALL_GetVertexAttribfvARB(disp, parameters) \
     (* GET_GetVertexAttribfvARB(disp)) parameters
-static INLINE _glptr_GetVertexAttribfvARB GET_GetVertexAttribfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribfvARB GET_GetVertexAttribfvARB(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribfvARB) (GET_by_offset(disp, _gloffset_GetVertexAttribfvARB));
 }
 
-static INLINE void SET_GetVertexAttribfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
+static inline void SET_GetVertexAttribfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribivARB)(GLuint, GLenum, GLint *);
 #define CALL_GetVertexAttribivARB(disp, parameters) \
     (* GET_GetVertexAttribivARB(disp)) parameters
-static INLINE _glptr_GetVertexAttribivARB GET_GetVertexAttribivARB(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribivARB GET_GetVertexAttribivARB(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribivARB) (GET_by_offset(disp, _gloffset_GetVertexAttribivARB));
 }
 
-static INLINE void SET_GetVertexAttribivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetVertexAttribivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dARB)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_ProgramEnvParameter4dARB(disp, parameters) \
     (* GET_ProgramEnvParameter4dARB(disp)) parameters
-static INLINE _glptr_ProgramEnvParameter4dARB GET_ProgramEnvParameter4dARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramEnvParameter4dARB GET_ProgramEnvParameter4dARB(struct _glapi_table *disp) {
    return (_glptr_ProgramEnvParameter4dARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB));
 }
 
-static INLINE void SET_ProgramEnvParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_ProgramEnvParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dvARB)(GLenum, GLuint, const GLdouble *);
 #define CALL_ProgramEnvParameter4dvARB(disp, parameters) \
     (* GET_ProgramEnvParameter4dvARB(disp)) parameters
-static INLINE _glptr_ProgramEnvParameter4dvARB GET_ProgramEnvParameter4dvARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramEnvParameter4dvARB GET_ProgramEnvParameter4dvARB(struct _glapi_table *disp) {
    return (_glptr_ProgramEnvParameter4dvARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB));
 }
 
-static INLINE void SET_ProgramEnvParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) {
+static inline void SET_ProgramEnvParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fARB)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_ProgramEnvParameter4fARB(disp, parameters) \
     (* GET_ProgramEnvParameter4fARB(disp)) parameters
-static INLINE _glptr_ProgramEnvParameter4fARB GET_ProgramEnvParameter4fARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramEnvParameter4fARB GET_ProgramEnvParameter4fARB(struct _glapi_table *disp) {
    return (_glptr_ProgramEnvParameter4fARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB));
 }
 
-static INLINE void SET_ProgramEnvParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_ProgramEnvParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fvARB)(GLenum, GLuint, const GLfloat *);
 #define CALL_ProgramEnvParameter4fvARB(disp, parameters) \
     (* GET_ProgramEnvParameter4fvARB(disp)) parameters
-static INLINE _glptr_ProgramEnvParameter4fvARB GET_ProgramEnvParameter4fvARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramEnvParameter4fvARB GET_ProgramEnvParameter4fvARB(struct _glapi_table *disp) {
    return (_glptr_ProgramEnvParameter4fvARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB));
 }
 
-static INLINE void SET_ProgramEnvParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
+static inline void SET_ProgramEnvParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dARB)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_ProgramLocalParameter4dARB(disp, parameters) \
     (* GET_ProgramLocalParameter4dARB(disp)) parameters
-static INLINE _glptr_ProgramLocalParameter4dARB GET_ProgramLocalParameter4dARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramLocalParameter4dARB GET_ProgramLocalParameter4dARB(struct _glapi_table *disp) {
    return (_glptr_ProgramLocalParameter4dARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB));
 }
 
-static INLINE void SET_ProgramLocalParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_ProgramLocalParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dvARB)(GLenum, GLuint, const GLdouble *);
 #define CALL_ProgramLocalParameter4dvARB(disp, parameters) \
     (* GET_ProgramLocalParameter4dvARB(disp)) parameters
-static INLINE _glptr_ProgramLocalParameter4dvARB GET_ProgramLocalParameter4dvARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramLocalParameter4dvARB GET_ProgramLocalParameter4dvARB(struct _glapi_table *disp) {
    return (_glptr_ProgramLocalParameter4dvARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB));
 }
 
-static INLINE void SET_ProgramLocalParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) {
+static inline void SET_ProgramLocalParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fARB)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_ProgramLocalParameter4fARB(disp, parameters) \
     (* GET_ProgramLocalParameter4fARB(disp)) parameters
-static INLINE _glptr_ProgramLocalParameter4fARB GET_ProgramLocalParameter4fARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramLocalParameter4fARB GET_ProgramLocalParameter4fARB(struct _glapi_table *disp) {
    return (_glptr_ProgramLocalParameter4fARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB));
 }
 
-static INLINE void SET_ProgramLocalParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_ProgramLocalParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fvARB)(GLenum, GLuint, const GLfloat *);
 #define CALL_ProgramLocalParameter4fvARB(disp, parameters) \
     (* GET_ProgramLocalParameter4fvARB(disp)) parameters
-static INLINE _glptr_ProgramLocalParameter4fvARB GET_ProgramLocalParameter4fvARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramLocalParameter4fvARB GET_ProgramLocalParameter4fvARB(struct _glapi_table *disp) {
    return (_glptr_ProgramLocalParameter4fvARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB));
 }
 
-static INLINE void SET_ProgramLocalParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
+static inline void SET_ProgramLocalParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramStringARB)(GLenum, GLenum, GLsizei, const GLvoid *);
 #define CALL_ProgramStringARB(disp, parameters) \
     (* GET_ProgramStringARB(disp)) parameters
-static INLINE _glptr_ProgramStringARB GET_ProgramStringARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramStringARB GET_ProgramStringARB(struct _glapi_table *disp) {
    return (_glptr_ProgramStringARB) (GET_by_offset(disp, _gloffset_ProgramStringARB));
 }
 
-static INLINE void SET_ProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_ProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ProgramStringARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1dARB)(GLuint, GLdouble);
 #define CALL_VertexAttrib1dARB(disp, parameters) \
     (* GET_VertexAttrib1dARB(disp)) parameters
-static INLINE _glptr_VertexAttrib1dARB GET_VertexAttrib1dARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1dARB GET_VertexAttrib1dARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1dARB) (GET_by_offset(disp, _gloffset_VertexAttrib1dARB));
 }
 
-static INLINE void SET_VertexAttrib1dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) {
+static inline void SET_VertexAttrib1dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvARB)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib1dvARB(disp, parameters) \
     (* GET_VertexAttrib1dvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib1dvARB GET_VertexAttrib1dvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1dvARB GET_VertexAttrib1dvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1dvARB) (GET_by_offset(disp, _gloffset_VertexAttrib1dvARB));
 }
 
-static INLINE void SET_VertexAttrib1dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib1dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1fARB)(GLuint, GLfloat);
 #define CALL_VertexAttrib1fARB(disp, parameters) \
     (* GET_VertexAttrib1fARB(disp)) parameters
-static INLINE _glptr_VertexAttrib1fARB GET_VertexAttrib1fARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1fARB GET_VertexAttrib1fARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1fARB) (GET_by_offset(disp, _gloffset_VertexAttrib1fARB));
 }
 
-static INLINE void SET_VertexAttrib1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) {
+static inline void SET_VertexAttrib1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvARB)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib1fvARB(disp, parameters) \
     (* GET_VertexAttrib1fvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib1fvARB GET_VertexAttrib1fvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1fvARB GET_VertexAttrib1fvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib1fvARB));
 }
 
-static INLINE void SET_VertexAttrib1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1sARB)(GLuint, GLshort);
 #define CALL_VertexAttrib1sARB(disp, parameters) \
     (* GET_VertexAttrib1sARB(disp)) parameters
-static INLINE _glptr_VertexAttrib1sARB GET_VertexAttrib1sARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1sARB GET_VertexAttrib1sARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1sARB) (GET_by_offset(disp, _gloffset_VertexAttrib1sARB));
 }
 
-static INLINE void SET_VertexAttrib1sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) {
+static inline void SET_VertexAttrib1sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1svARB)(GLuint, const GLshort *);
 #define CALL_VertexAttrib1svARB(disp, parameters) \
     (* GET_VertexAttrib1svARB(disp)) parameters
-static INLINE _glptr_VertexAttrib1svARB GET_VertexAttrib1svARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1svARB GET_VertexAttrib1svARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1svARB) (GET_by_offset(disp, _gloffset_VertexAttrib1svARB));
 }
 
-static INLINE void SET_VertexAttrib1svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib1svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2dARB)(GLuint, GLdouble, GLdouble);
 #define CALL_VertexAttrib2dARB(disp, parameters) \
     (* GET_VertexAttrib2dARB(disp)) parameters
-static INLINE _glptr_VertexAttrib2dARB GET_VertexAttrib2dARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2dARB GET_VertexAttrib2dARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2dARB) (GET_by_offset(disp, _gloffset_VertexAttrib2dARB));
 }
 
-static INLINE void SET_VertexAttrib2dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) {
+static inline void SET_VertexAttrib2dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvARB)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib2dvARB(disp, parameters) \
     (* GET_VertexAttrib2dvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib2dvARB GET_VertexAttrib2dvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2dvARB GET_VertexAttrib2dvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2dvARB) (GET_by_offset(disp, _gloffset_VertexAttrib2dvARB));
 }
 
-static INLINE void SET_VertexAttrib2dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib2dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2fARB)(GLuint, GLfloat, GLfloat);
 #define CALL_VertexAttrib2fARB(disp, parameters) \
     (* GET_VertexAttrib2fARB(disp)) parameters
-static INLINE _glptr_VertexAttrib2fARB GET_VertexAttrib2fARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2fARB GET_VertexAttrib2fARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2fARB) (GET_by_offset(disp, _gloffset_VertexAttrib2fARB));
 }
 
-static INLINE void SET_VertexAttrib2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) {
+static inline void SET_VertexAttrib2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvARB)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib2fvARB(disp, parameters) \
     (* GET_VertexAttrib2fvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib2fvARB GET_VertexAttrib2fvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2fvARB GET_VertexAttrib2fvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib2fvARB));
 }
 
-static INLINE void SET_VertexAttrib2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2sARB)(GLuint, GLshort, GLshort);
 #define CALL_VertexAttrib2sARB(disp, parameters) \
     (* GET_VertexAttrib2sARB(disp)) parameters
-static INLINE _glptr_VertexAttrib2sARB GET_VertexAttrib2sARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2sARB GET_VertexAttrib2sARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2sARB) (GET_by_offset(disp, _gloffset_VertexAttrib2sARB));
 }
 
-static INLINE void SET_VertexAttrib2sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) {
+static inline void SET_VertexAttrib2sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2svARB)(GLuint, const GLshort *);
 #define CALL_VertexAttrib2svARB(disp, parameters) \
     (* GET_VertexAttrib2svARB(disp)) parameters
-static INLINE _glptr_VertexAttrib2svARB GET_VertexAttrib2svARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2svARB GET_VertexAttrib2svARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2svARB) (GET_by_offset(disp, _gloffset_VertexAttrib2svARB));
 }
 
-static INLINE void SET_VertexAttrib2svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib2svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3dARB)(GLuint, GLdouble, GLdouble, GLdouble);
 #define CALL_VertexAttrib3dARB(disp, parameters) \
     (* GET_VertexAttrib3dARB(disp)) parameters
-static INLINE _glptr_VertexAttrib3dARB GET_VertexAttrib3dARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3dARB GET_VertexAttrib3dARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3dARB) (GET_by_offset(disp, _gloffset_VertexAttrib3dARB));
 }
 
-static INLINE void SET_VertexAttrib3dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_VertexAttrib3dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvARB)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib3dvARB(disp, parameters) \
     (* GET_VertexAttrib3dvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib3dvARB GET_VertexAttrib3dvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3dvARB GET_VertexAttrib3dvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3dvARB) (GET_by_offset(disp, _gloffset_VertexAttrib3dvARB));
 }
 
-static INLINE void SET_VertexAttrib3dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib3dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3fARB)(GLuint, GLfloat, GLfloat, GLfloat);
 #define CALL_VertexAttrib3fARB(disp, parameters) \
     (* GET_VertexAttrib3fARB(disp)) parameters
-static INLINE _glptr_VertexAttrib3fARB GET_VertexAttrib3fARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3fARB GET_VertexAttrib3fARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3fARB) (GET_by_offset(disp, _gloffset_VertexAttrib3fARB));
 }
 
-static INLINE void SET_VertexAttrib3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_VertexAttrib3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvARB)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib3fvARB(disp, parameters) \
     (* GET_VertexAttrib3fvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib3fvARB GET_VertexAttrib3fvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3fvARB GET_VertexAttrib3fvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib3fvARB));
 }
 
-static INLINE void SET_VertexAttrib3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3sARB)(GLuint, GLshort, GLshort, GLshort);
 #define CALL_VertexAttrib3sARB(disp, parameters) \
     (* GET_VertexAttrib3sARB(disp)) parameters
-static INLINE _glptr_VertexAttrib3sARB GET_VertexAttrib3sARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3sARB GET_VertexAttrib3sARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3sARB) (GET_by_offset(disp, _gloffset_VertexAttrib3sARB));
 }
 
-static INLINE void SET_VertexAttrib3sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) {
+static inline void SET_VertexAttrib3sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3svARB)(GLuint, const GLshort *);
 #define CALL_VertexAttrib3svARB(disp, parameters) \
     (* GET_VertexAttrib3svARB(disp)) parameters
-static INLINE _glptr_VertexAttrib3svARB GET_VertexAttrib3svARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3svARB GET_VertexAttrib3svARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3svARB) (GET_by_offset(disp, _gloffset_VertexAttrib3svARB));
 }
 
-static INLINE void SET_VertexAttrib3svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib3svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NbvARB)(GLuint, const GLbyte *);
 #define CALL_VertexAttrib4NbvARB(disp, parameters) \
     (* GET_VertexAttrib4NbvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NbvARB GET_VertexAttrib4NbvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NbvARB GET_VertexAttrib4NbvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NbvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NbvARB));
 }
 
-static INLINE void SET_VertexAttrib4NbvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
+static inline void SET_VertexAttrib4NbvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NbvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NivARB)(GLuint, const GLint *);
 #define CALL_VertexAttrib4NivARB(disp, parameters) \
     (* GET_VertexAttrib4NivARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NivARB GET_VertexAttrib4NivARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NivARB GET_VertexAttrib4NivARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NivARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NivARB));
 }
 
-static INLINE void SET_VertexAttrib4NivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+static inline void SET_VertexAttrib4NivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NsvARB)(GLuint, const GLshort *);
 #define CALL_VertexAttrib4NsvARB(disp, parameters) \
     (* GET_VertexAttrib4NsvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NsvARB GET_VertexAttrib4NsvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NsvARB GET_VertexAttrib4NsvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NsvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NsvARB));
 }
 
-static INLINE void SET_VertexAttrib4NsvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib4NsvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NsvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NubARB)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
 #define CALL_VertexAttrib4NubARB(disp, parameters) \
     (* GET_VertexAttrib4NubARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NubARB GET_VertexAttrib4NubARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NubARB GET_VertexAttrib4NubARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NubARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NubARB));
 }
 
-static INLINE void SET_VertexAttrib4NubARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) {
+static inline void SET_VertexAttrib4NubARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NubARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NubvARB)(GLuint, const GLubyte *);
 #define CALL_VertexAttrib4NubvARB(disp, parameters) \
     (* GET_VertexAttrib4NubvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NubvARB GET_VertexAttrib4NubvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NubvARB GET_VertexAttrib4NubvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NubvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NubvARB));
 }
 
-static INLINE void SET_VertexAttrib4NubvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+static inline void SET_VertexAttrib4NubvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NubvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NuivARB)(GLuint, const GLuint *);
 #define CALL_VertexAttrib4NuivARB(disp, parameters) \
     (* GET_VertexAttrib4NuivARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NuivARB GET_VertexAttrib4NuivARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NuivARB GET_VertexAttrib4NuivARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NuivARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NuivARB));
 }
 
-static INLINE void SET_VertexAttrib4NuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+static inline void SET_VertexAttrib4NuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NuivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4NusvARB)(GLuint, const GLushort *);
 #define CALL_VertexAttrib4NusvARB(disp, parameters) \
     (* GET_VertexAttrib4NusvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4NusvARB GET_VertexAttrib4NusvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4NusvARB GET_VertexAttrib4NusvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4NusvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4NusvARB));
 }
 
-static INLINE void SET_VertexAttrib4NusvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
+static inline void SET_VertexAttrib4NusvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4NusvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4bvARB)(GLuint, const GLbyte *);
 #define CALL_VertexAttrib4bvARB(disp, parameters) \
     (* GET_VertexAttrib4bvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4bvARB GET_VertexAttrib4bvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4bvARB GET_VertexAttrib4bvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4bvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4bvARB));
 }
 
-static INLINE void SET_VertexAttrib4bvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
+static inline void SET_VertexAttrib4bvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4bvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4dARB)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_VertexAttrib4dARB(disp, parameters) \
     (* GET_VertexAttrib4dARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4dARB GET_VertexAttrib4dARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4dARB GET_VertexAttrib4dARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4dARB) (GET_by_offset(disp, _gloffset_VertexAttrib4dARB));
 }
 
-static INLINE void SET_VertexAttrib4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_VertexAttrib4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4dARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvARB)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib4dvARB(disp, parameters) \
     (* GET_VertexAttrib4dvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4dvARB GET_VertexAttrib4dvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4dvARB GET_VertexAttrib4dvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4dvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4dvARB));
 }
 
-static INLINE void SET_VertexAttrib4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4dvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4fARB)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_VertexAttrib4fARB(disp, parameters) \
     (* GET_VertexAttrib4fARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4fARB GET_VertexAttrib4fARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4fARB GET_VertexAttrib4fARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4fARB) (GET_by_offset(disp, _gloffset_VertexAttrib4fARB));
 }
 
-static INLINE void SET_VertexAttrib4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_VertexAttrib4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvARB)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib4fvARB(disp, parameters) \
     (* GET_VertexAttrib4fvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4fvARB GET_VertexAttrib4fvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4fvARB GET_VertexAttrib4fvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4fvARB));
 }
 
-static INLINE void SET_VertexAttrib4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4ivARB)(GLuint, const GLint *);
 #define CALL_VertexAttrib4ivARB(disp, parameters) \
     (* GET_VertexAttrib4ivARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4ivARB GET_VertexAttrib4ivARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4ivARB GET_VertexAttrib4ivARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4ivARB) (GET_by_offset(disp, _gloffset_VertexAttrib4ivARB));
 }
 
-static INLINE void SET_VertexAttrib4ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+static inline void SET_VertexAttrib4ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4sARB)(GLuint, GLshort, GLshort, GLshort, GLshort);
 #define CALL_VertexAttrib4sARB(disp, parameters) \
     (* GET_VertexAttrib4sARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4sARB GET_VertexAttrib4sARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4sARB GET_VertexAttrib4sARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4sARB) (GET_by_offset(disp, _gloffset_VertexAttrib4sARB));
 }
 
-static INLINE void SET_VertexAttrib4sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_VertexAttrib4sARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4sARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4svARB)(GLuint, const GLshort *);
 #define CALL_VertexAttrib4svARB(disp, parameters) \
     (* GET_VertexAttrib4svARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4svARB GET_VertexAttrib4svARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4svARB GET_VertexAttrib4svARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4svARB) (GET_by_offset(disp, _gloffset_VertexAttrib4svARB));
 }
 
-static INLINE void SET_VertexAttrib4svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib4svARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4svARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvARB)(GLuint, const GLubyte *);
 #define CALL_VertexAttrib4ubvARB(disp, parameters) \
     (* GET_VertexAttrib4ubvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4ubvARB GET_VertexAttrib4ubvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4ubvARB GET_VertexAttrib4ubvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4ubvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4ubvARB));
 }
 
-static INLINE void SET_VertexAttrib4ubvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+static inline void SET_VertexAttrib4ubvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4ubvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4uivARB)(GLuint, const GLuint *);
 #define CALL_VertexAttrib4uivARB(disp, parameters) \
     (* GET_VertexAttrib4uivARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4uivARB GET_VertexAttrib4uivARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4uivARB GET_VertexAttrib4uivARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4uivARB) (GET_by_offset(disp, _gloffset_VertexAttrib4uivARB));
 }
 
-static INLINE void SET_VertexAttrib4uivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+static inline void SET_VertexAttrib4uivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4uivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4usvARB)(GLuint, const GLushort *);
 #define CALL_VertexAttrib4usvARB(disp, parameters) \
     (* GET_VertexAttrib4usvARB(disp)) parameters
-static INLINE _glptr_VertexAttrib4usvARB GET_VertexAttrib4usvARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4usvARB GET_VertexAttrib4usvARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4usvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4usvARB));
 }
 
-static INLINE void SET_VertexAttrib4usvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
+static inline void SET_VertexAttrib4usvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4usvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribPointerARB)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
 #define CALL_VertexAttribPointerARB(disp, parameters) \
     (* GET_VertexAttribPointerARB(disp)) parameters
-static INLINE _glptr_VertexAttribPointerARB GET_VertexAttribPointerARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribPointerARB GET_VertexAttribPointerARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttribPointerARB) (GET_by_offset(disp, _gloffset_VertexAttribPointerARB));
 }
 
-static INLINE void SET_VertexAttribPointerARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *)) {
+static inline void SET_VertexAttribPointerARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_VertexAttribPointerARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindBufferARB)(GLenum, GLuint);
 #define CALL_BindBufferARB(disp, parameters) \
     (* GET_BindBufferARB(disp)) parameters
-static INLINE _glptr_BindBufferARB GET_BindBufferARB(struct _glapi_table *disp) {
+static inline _glptr_BindBufferARB GET_BindBufferARB(struct _glapi_table *disp) {
    return (_glptr_BindBufferARB) (GET_by_offset(disp, _gloffset_BindBufferARB));
 }
 
-static INLINE void SET_BindBufferARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BindBufferARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BindBufferARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BufferDataARB)(GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
 #define CALL_BufferDataARB(disp, parameters) \
     (* GET_BufferDataARB(disp)) parameters
-static INLINE _glptr_BufferDataARB GET_BufferDataARB(struct _glapi_table *disp) {
+static inline _glptr_BufferDataARB GET_BufferDataARB(struct _glapi_table *disp) {
    return (_glptr_BufferDataARB) (GET_by_offset(disp, _gloffset_BufferDataARB));
 }
 
-static INLINE void SET_BufferDataARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizeiptrARB, const GLvoid *, GLenum)) {
+static inline void SET_BufferDataARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizeiptrARB, const GLvoid *, GLenum)) {
    SET_by_offset(disp, _gloffset_BufferDataARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BufferSubDataARB)(GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
 #define CALL_BufferSubDataARB(disp, parameters) \
     (* GET_BufferSubDataARB(disp)) parameters
-static INLINE _glptr_BufferSubDataARB GET_BufferSubDataARB(struct _glapi_table *disp) {
+static inline _glptr_BufferSubDataARB GET_BufferSubDataARB(struct _glapi_table *disp) {
    return (_glptr_BufferSubDataARB) (GET_by_offset(disp, _gloffset_BufferSubDataARB));
 }
 
-static INLINE void SET_BufferSubDataARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *)) {
+static inline void SET_BufferSubDataARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_BufferSubDataARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteBuffersARB)(GLsizei, const GLuint *);
 #define CALL_DeleteBuffersARB(disp, parameters) \
     (* GET_DeleteBuffersARB(disp)) parameters
-static INLINE _glptr_DeleteBuffersARB GET_DeleteBuffersARB(struct _glapi_table *disp) {
+static inline _glptr_DeleteBuffersARB GET_DeleteBuffersARB(struct _glapi_table *disp) {
    return (_glptr_DeleteBuffersARB) (GET_by_offset(disp, _gloffset_DeleteBuffersARB));
 }
 
-static INLINE void SET_DeleteBuffersARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteBuffersARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteBuffersARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenBuffersARB)(GLsizei, GLuint *);
 #define CALL_GenBuffersARB(disp, parameters) \
     (* GET_GenBuffersARB(disp)) parameters
-static INLINE _glptr_GenBuffersARB GET_GenBuffersARB(struct _glapi_table *disp) {
+static inline _glptr_GenBuffersARB GET_GenBuffersARB(struct _glapi_table *disp) {
    return (_glptr_GenBuffersARB) (GET_by_offset(disp, _gloffset_GenBuffersARB));
 }
 
-static INLINE void SET_GenBuffersARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenBuffersARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenBuffersARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetBufferParameterivARB)(GLenum, GLenum, GLint *);
 #define CALL_GetBufferParameterivARB(disp, parameters) \
     (* GET_GetBufferParameterivARB(disp)) parameters
-static INLINE _glptr_GetBufferParameterivARB GET_GetBufferParameterivARB(struct _glapi_table *disp) {
+static inline _glptr_GetBufferParameterivARB GET_GetBufferParameterivARB(struct _glapi_table *disp) {
    return (_glptr_GetBufferParameterivARB) (GET_by_offset(disp, _gloffset_GetBufferParameterivARB));
 }
 
-static INLINE void SET_GetBufferParameterivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetBufferParameterivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetBufferParameterivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetBufferPointervARB)(GLenum, GLenum, GLvoid **);
 #define CALL_GetBufferPointervARB(disp, parameters) \
     (* GET_GetBufferPointervARB(disp)) parameters
-static INLINE _glptr_GetBufferPointervARB GET_GetBufferPointervARB(struct _glapi_table *disp) {
+static inline _glptr_GetBufferPointervARB GET_GetBufferPointervARB(struct _glapi_table *disp) {
    return (_glptr_GetBufferPointervARB) (GET_by_offset(disp, _gloffset_GetBufferPointervARB));
 }
 
-static INLINE void SET_GetBufferPointervARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid **)) {
+static inline void SET_GetBufferPointervARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid **)) {
    SET_by_offset(disp, _gloffset_GetBufferPointervARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetBufferSubDataARB)(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
 #define CALL_GetBufferSubDataARB(disp, parameters) \
     (* GET_GetBufferSubDataARB(disp)) parameters
-static INLINE _glptr_GetBufferSubDataARB GET_GetBufferSubDataARB(struct _glapi_table *disp) {
+static inline _glptr_GetBufferSubDataARB GET_GetBufferSubDataARB(struct _glapi_table *disp) {
    return (_glptr_GetBufferSubDataARB) (GET_by_offset(disp, _gloffset_GetBufferSubDataARB));
 }
 
-static INLINE void SET_GetBufferSubDataARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *)) {
+static inline void SET_GetBufferSubDataARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetBufferSubDataARB, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsBufferARB)(GLuint);
 #define CALL_IsBufferARB(disp, parameters) \
     (* GET_IsBufferARB(disp)) parameters
-static INLINE _glptr_IsBufferARB GET_IsBufferARB(struct _glapi_table *disp) {
+static inline _glptr_IsBufferARB GET_IsBufferARB(struct _glapi_table *disp) {
    return (_glptr_IsBufferARB) (GET_by_offset(disp, _gloffset_IsBufferARB));
 }
 
-static INLINE void SET_IsBufferARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsBufferARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsBufferARB, fn);
 }
 
 typedef GLvoid * (GLAPIENTRYP _glptr_MapBufferARB)(GLenum, GLenum);
 #define CALL_MapBufferARB(disp, parameters) \
     (* GET_MapBufferARB(disp)) parameters
-static INLINE _glptr_MapBufferARB GET_MapBufferARB(struct _glapi_table *disp) {
+static inline _glptr_MapBufferARB GET_MapBufferARB(struct _glapi_table *disp) {
    return (_glptr_MapBufferARB) (GET_by_offset(disp, _gloffset_MapBufferARB));
 }
 
-static INLINE void SET_MapBufferARB(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_MapBufferARB(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_MapBufferARB, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_UnmapBufferARB)(GLenum);
 #define CALL_UnmapBufferARB(disp, parameters) \
     (* GET_UnmapBufferARB(disp)) parameters
-static INLINE _glptr_UnmapBufferARB GET_UnmapBufferARB(struct _glapi_table *disp) {
+static inline _glptr_UnmapBufferARB GET_UnmapBufferARB(struct _glapi_table *disp) {
    return (_glptr_UnmapBufferARB) (GET_by_offset(disp, _gloffset_UnmapBufferARB));
 }
 
-static INLINE void SET_UnmapBufferARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_UnmapBufferARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_UnmapBufferARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BeginQueryARB)(GLenum, GLuint);
 #define CALL_BeginQueryARB(disp, parameters) \
     (* GET_BeginQueryARB(disp)) parameters
-static INLINE _glptr_BeginQueryARB GET_BeginQueryARB(struct _glapi_table *disp) {
+static inline _glptr_BeginQueryARB GET_BeginQueryARB(struct _glapi_table *disp) {
    return (_glptr_BeginQueryARB) (GET_by_offset(disp, _gloffset_BeginQueryARB));
 }
 
-static INLINE void SET_BeginQueryARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BeginQueryARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BeginQueryARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteQueriesARB)(GLsizei, const GLuint *);
 #define CALL_DeleteQueriesARB(disp, parameters) \
     (* GET_DeleteQueriesARB(disp)) parameters
-static INLINE _glptr_DeleteQueriesARB GET_DeleteQueriesARB(struct _glapi_table *disp) {
+static inline _glptr_DeleteQueriesARB GET_DeleteQueriesARB(struct _glapi_table *disp) {
    return (_glptr_DeleteQueriesARB) (GET_by_offset(disp, _gloffset_DeleteQueriesARB));
 }
 
-static INLINE void SET_DeleteQueriesARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteQueriesARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteQueriesARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EndQueryARB)(GLenum);
 #define CALL_EndQueryARB(disp, parameters) \
     (* GET_EndQueryARB(disp)) parameters
-static INLINE _glptr_EndQueryARB GET_EndQueryARB(struct _glapi_table *disp) {
+static inline _glptr_EndQueryARB GET_EndQueryARB(struct _glapi_table *disp) {
    return (_glptr_EndQueryARB) (GET_by_offset(disp, _gloffset_EndQueryARB));
 }
 
-static INLINE void SET_EndQueryARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_EndQueryARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_EndQueryARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenQueriesARB)(GLsizei, GLuint *);
 #define CALL_GenQueriesARB(disp, parameters) \
     (* GET_GenQueriesARB(disp)) parameters
-static INLINE _glptr_GenQueriesARB GET_GenQueriesARB(struct _glapi_table *disp) {
+static inline _glptr_GenQueriesARB GET_GenQueriesARB(struct _glapi_table *disp) {
    return (_glptr_GenQueriesARB) (GET_by_offset(disp, _gloffset_GenQueriesARB));
 }
 
-static INLINE void SET_GenQueriesARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenQueriesARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenQueriesARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetQueryObjectivARB)(GLuint, GLenum, GLint *);
 #define CALL_GetQueryObjectivARB(disp, parameters) \
     (* GET_GetQueryObjectivARB(disp)) parameters
-static INLINE _glptr_GetQueryObjectivARB GET_GetQueryObjectivARB(struct _glapi_table *disp) {
+static inline _glptr_GetQueryObjectivARB GET_GetQueryObjectivARB(struct _glapi_table *disp) {
    return (_glptr_GetQueryObjectivARB) (GET_by_offset(disp, _gloffset_GetQueryObjectivARB));
 }
 
-static INLINE void SET_GetQueryObjectivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetQueryObjectivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetQueryObjectivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetQueryObjectuivARB)(GLuint, GLenum, GLuint *);
 #define CALL_GetQueryObjectuivARB(disp, parameters) \
     (* GET_GetQueryObjectuivARB(disp)) parameters
-static INLINE _glptr_GetQueryObjectuivARB GET_GetQueryObjectuivARB(struct _glapi_table *disp) {
+static inline _glptr_GetQueryObjectuivARB GET_GetQueryObjectuivARB(struct _glapi_table *disp) {
    return (_glptr_GetQueryObjectuivARB) (GET_by_offset(disp, _gloffset_GetQueryObjectuivARB));
 }
 
-static INLINE void SET_GetQueryObjectuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
+static inline void SET_GetQueryObjectuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetQueryObjectuivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetQueryivARB)(GLenum, GLenum, GLint *);
 #define CALL_GetQueryivARB(disp, parameters) \
     (* GET_GetQueryivARB(disp)) parameters
-static INLINE _glptr_GetQueryivARB GET_GetQueryivARB(struct _glapi_table *disp) {
+static inline _glptr_GetQueryivARB GET_GetQueryivARB(struct _glapi_table *disp) {
    return (_glptr_GetQueryivARB) (GET_by_offset(disp, _gloffset_GetQueryivARB));
 }
 
-static INLINE void SET_GetQueryivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetQueryivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetQueryivARB, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsQueryARB)(GLuint);
 #define CALL_IsQueryARB(disp, parameters) \
     (* GET_IsQueryARB(disp)) parameters
-static INLINE _glptr_IsQueryARB GET_IsQueryARB(struct _glapi_table *disp) {
+static inline _glptr_IsQueryARB GET_IsQueryARB(struct _glapi_table *disp) {
    return (_glptr_IsQueryARB) (GET_by_offset(disp, _gloffset_IsQueryARB));
 }
 
-static INLINE void SET_IsQueryARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsQueryARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsQueryARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_AttachObjectARB)(GLhandleARB, GLhandleARB);
 #define CALL_AttachObjectARB(disp, parameters) \
     (* GET_AttachObjectARB(disp)) parameters
-static INLINE _glptr_AttachObjectARB GET_AttachObjectARB(struct _glapi_table *disp) {
+static inline _glptr_AttachObjectARB GET_AttachObjectARB(struct _glapi_table *disp) {
    return (_glptr_AttachObjectARB) (GET_by_offset(disp, _gloffset_AttachObjectARB));
 }
 
-static INLINE void SET_AttachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) {
+static inline void SET_AttachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) {
    SET_by_offset(disp, _gloffset_AttachObjectARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CompileShaderARB)(GLhandleARB);
 #define CALL_CompileShaderARB(disp, parameters) \
     (* GET_CompileShaderARB(disp)) parameters
-static INLINE _glptr_CompileShaderARB GET_CompileShaderARB(struct _glapi_table *disp) {
+static inline _glptr_CompileShaderARB GET_CompileShaderARB(struct _glapi_table *disp) {
    return (_glptr_CompileShaderARB) (GET_by_offset(disp, _gloffset_CompileShaderARB));
 }
 
-static INLINE void SET_CompileShaderARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
+static inline void SET_CompileShaderARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
    SET_by_offset(disp, _gloffset_CompileShaderARB, fn);
 }
 
 typedef GLhandleARB (GLAPIENTRYP _glptr_CreateProgramObjectARB)(void);
 #define CALL_CreateProgramObjectARB(disp, parameters) \
     (* GET_CreateProgramObjectARB(disp)) parameters
-static INLINE _glptr_CreateProgramObjectARB GET_CreateProgramObjectARB(struct _glapi_table *disp) {
+static inline _glptr_CreateProgramObjectARB GET_CreateProgramObjectARB(struct _glapi_table *disp) {
    return (_glptr_CreateProgramObjectARB) (GET_by_offset(disp, _gloffset_CreateProgramObjectARB));
 }
 
-static INLINE void SET_CreateProgramObjectARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(void)) {
+static inline void SET_CreateProgramObjectARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_CreateProgramObjectARB, fn);
 }
 
 typedef GLhandleARB (GLAPIENTRYP _glptr_CreateShaderObjectARB)(GLenum);
 #define CALL_CreateShaderObjectARB(disp, parameters) \
     (* GET_CreateShaderObjectARB(disp)) parameters
-static INLINE _glptr_CreateShaderObjectARB GET_CreateShaderObjectARB(struct _glapi_table *disp) {
+static inline _glptr_CreateShaderObjectARB GET_CreateShaderObjectARB(struct _glapi_table *disp) {
    return (_glptr_CreateShaderObjectARB) (GET_by_offset(disp, _gloffset_CreateShaderObjectARB));
 }
 
-static INLINE void SET_CreateShaderObjectARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_CreateShaderObjectARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_CreateShaderObjectARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteObjectARB)(GLhandleARB);
 #define CALL_DeleteObjectARB(disp, parameters) \
     (* GET_DeleteObjectARB(disp)) parameters
-static INLINE _glptr_DeleteObjectARB GET_DeleteObjectARB(struct _glapi_table *disp) {
+static inline _glptr_DeleteObjectARB GET_DeleteObjectARB(struct _glapi_table *disp) {
    return (_glptr_DeleteObjectARB) (GET_by_offset(disp, _gloffset_DeleteObjectARB));
 }
 
-static INLINE void SET_DeleteObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
+static inline void SET_DeleteObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
    SET_by_offset(disp, _gloffset_DeleteObjectARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DetachObjectARB)(GLhandleARB, GLhandleARB);
 #define CALL_DetachObjectARB(disp, parameters) \
     (* GET_DetachObjectARB(disp)) parameters
-static INLINE _glptr_DetachObjectARB GET_DetachObjectARB(struct _glapi_table *disp) {
+static inline _glptr_DetachObjectARB GET_DetachObjectARB(struct _glapi_table *disp) {
    return (_glptr_DetachObjectARB) (GET_by_offset(disp, _gloffset_DetachObjectARB));
 }
 
-static INLINE void SET_DetachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) {
+static inline void SET_DetachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) {
    SET_by_offset(disp, _gloffset_DetachObjectARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetActiveUniformARB)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
 #define CALL_GetActiveUniformARB(disp, parameters) \
     (* GET_GetActiveUniformARB(disp)) parameters
-static INLINE _glptr_GetActiveUniformARB GET_GetActiveUniformARB(struct _glapi_table *disp) {
+static inline _glptr_GetActiveUniformARB GET_GetActiveUniformARB(struct _glapi_table *disp) {
    return (_glptr_GetActiveUniformARB) (GET_by_offset(disp, _gloffset_GetActiveUniformARB));
 }
 
-static INLINE void SET_GetActiveUniformARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)) {
+static inline void SET_GetActiveUniformARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)) {
    SET_by_offset(disp, _gloffset_GetActiveUniformARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetAttachedObjectsARB)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
 #define CALL_GetAttachedObjectsARB(disp, parameters) \
     (* GET_GetAttachedObjectsARB(disp)) parameters
-static INLINE _glptr_GetAttachedObjectsARB GET_GetAttachedObjectsARB(struct _glapi_table *disp) {
+static inline _glptr_GetAttachedObjectsARB GET_GetAttachedObjectsARB(struct _glapi_table *disp) {
    return (_glptr_GetAttachedObjectsARB) (GET_by_offset(disp, _gloffset_GetAttachedObjectsARB));
 }
 
-static INLINE void SET_GetAttachedObjectsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *)) {
+static inline void SET_GetAttachedObjectsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *)) {
    SET_by_offset(disp, _gloffset_GetAttachedObjectsARB, fn);
 }
 
 typedef GLhandleARB (GLAPIENTRYP _glptr_GetHandleARB)(GLenum);
 #define CALL_GetHandleARB(disp, parameters) \
     (* GET_GetHandleARB(disp)) parameters
-static INLINE _glptr_GetHandleARB GET_GetHandleARB(struct _glapi_table *disp) {
+static inline _glptr_GetHandleARB GET_GetHandleARB(struct _glapi_table *disp) {
    return (_glptr_GetHandleARB) (GET_by_offset(disp, _gloffset_GetHandleARB));
 }
 
-static INLINE void SET_GetHandleARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_GetHandleARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_GetHandleARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetInfoLogARB)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
 #define CALL_GetInfoLogARB(disp, parameters) \
     (* GET_GetInfoLogARB(disp)) parameters
-static INLINE _glptr_GetInfoLogARB GET_GetInfoLogARB(struct _glapi_table *disp) {
+static inline _glptr_GetInfoLogARB GET_GetInfoLogARB(struct _glapi_table *disp) {
    return (_glptr_GetInfoLogARB) (GET_by_offset(disp, _gloffset_GetInfoLogARB));
 }
 
-static INLINE void SET_GetInfoLogARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)) {
+static inline void SET_GetInfoLogARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)) {
    SET_by_offset(disp, _gloffset_GetInfoLogARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetObjectParameterfvARB)(GLhandleARB, GLenum, GLfloat *);
 #define CALL_GetObjectParameterfvARB(disp, parameters) \
     (* GET_GetObjectParameterfvARB(disp)) parameters
-static INLINE _glptr_GetObjectParameterfvARB GET_GetObjectParameterfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetObjectParameterfvARB GET_GetObjectParameterfvARB(struct _glapi_table *disp) {
    return (_glptr_GetObjectParameterfvARB) (GET_by_offset(disp, _gloffset_GetObjectParameterfvARB));
 }
 
-static INLINE void SET_GetObjectParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLfloat *)) {
+static inline void SET_GetObjectParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetObjectParameterfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetObjectParameterivARB)(GLhandleARB, GLenum, GLint *);
 #define CALL_GetObjectParameterivARB(disp, parameters) \
     (* GET_GetObjectParameterivARB(disp)) parameters
-static INLINE _glptr_GetObjectParameterivARB GET_GetObjectParameterivARB(struct _glapi_table *disp) {
+static inline _glptr_GetObjectParameterivARB GET_GetObjectParameterivARB(struct _glapi_table *disp) {
    return (_glptr_GetObjectParameterivARB) (GET_by_offset(disp, _gloffset_GetObjectParameterivARB));
 }
 
-static INLINE void SET_GetObjectParameterivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLint *)) {
+static inline void SET_GetObjectParameterivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetObjectParameterivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetShaderSourceARB)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
 #define CALL_GetShaderSourceARB(disp, parameters) \
     (* GET_GetShaderSourceARB(disp)) parameters
-static INLINE _glptr_GetShaderSourceARB GET_GetShaderSourceARB(struct _glapi_table *disp) {
+static inline _glptr_GetShaderSourceARB GET_GetShaderSourceARB(struct _glapi_table *disp) {
    return (_glptr_GetShaderSourceARB) (GET_by_offset(disp, _gloffset_GetShaderSourceARB));
 }
 
-static INLINE void SET_GetShaderSourceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)) {
+static inline void SET_GetShaderSourceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)) {
    SET_by_offset(disp, _gloffset_GetShaderSourceARB, fn);
 }
 
 typedef GLint (GLAPIENTRYP _glptr_GetUniformLocationARB)(GLhandleARB, const GLcharARB *);
 #define CALL_GetUniformLocationARB(disp, parameters) \
     (* GET_GetUniformLocationARB(disp)) parameters
-static INLINE _glptr_GetUniformLocationARB GET_GetUniformLocationARB(struct _glapi_table *disp) {
+static inline _glptr_GetUniformLocationARB GET_GetUniformLocationARB(struct _glapi_table *disp) {
    return (_glptr_GetUniformLocationARB) (GET_by_offset(disp, _gloffset_GetUniformLocationARB));
 }
 
-static INLINE void SET_GetUniformLocationARB(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLhandleARB, const GLcharARB *)) {
+static inline void SET_GetUniformLocationARB(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLhandleARB, const GLcharARB *)) {
    SET_by_offset(disp, _gloffset_GetUniformLocationARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetUniformfvARB)(GLhandleARB, GLint, GLfloat *);
 #define CALL_GetUniformfvARB(disp, parameters) \
     (* GET_GetUniformfvARB(disp)) parameters
-static INLINE _glptr_GetUniformfvARB GET_GetUniformfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetUniformfvARB GET_GetUniformfvARB(struct _glapi_table *disp) {
    return (_glptr_GetUniformfvARB) (GET_by_offset(disp, _gloffset_GetUniformfvARB));
 }
 
-static INLINE void SET_GetUniformfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLfloat *)) {
+static inline void SET_GetUniformfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetUniformfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetUniformivARB)(GLhandleARB, GLint, GLint *);
 #define CALL_GetUniformivARB(disp, parameters) \
     (* GET_GetUniformivARB(disp)) parameters
-static INLINE _glptr_GetUniformivARB GET_GetUniformivARB(struct _glapi_table *disp) {
+static inline _glptr_GetUniformivARB GET_GetUniformivARB(struct _glapi_table *disp) {
    return (_glptr_GetUniformivARB) (GET_by_offset(disp, _gloffset_GetUniformivARB));
 }
 
-static INLINE void SET_GetUniformivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLint *)) {
+static inline void SET_GetUniformivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLint *)) {
    SET_by_offset(disp, _gloffset_GetUniformivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LinkProgramARB)(GLhandleARB);
 #define CALL_LinkProgramARB(disp, parameters) \
     (* GET_LinkProgramARB(disp)) parameters
-static INLINE _glptr_LinkProgramARB GET_LinkProgramARB(struct _glapi_table *disp) {
+static inline _glptr_LinkProgramARB GET_LinkProgramARB(struct _glapi_table *disp) {
    return (_glptr_LinkProgramARB) (GET_by_offset(disp, _gloffset_LinkProgramARB));
 }
 
-static INLINE void SET_LinkProgramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
+static inline void SET_LinkProgramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
    SET_by_offset(disp, _gloffset_LinkProgramARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ShaderSourceARB)(GLhandleARB, GLsizei, const GLcharARB **, const GLint *);
 #define CALL_ShaderSourceARB(disp, parameters) \
     (* GET_ShaderSourceARB(disp)) parameters
-static INLINE _glptr_ShaderSourceARB GET_ShaderSourceARB(struct _glapi_table *disp) {
+static inline _glptr_ShaderSourceARB GET_ShaderSourceARB(struct _glapi_table *disp) {
    return (_glptr_ShaderSourceARB) (GET_by_offset(disp, _gloffset_ShaderSourceARB));
 }
 
-static INLINE void SET_ShaderSourceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, const GLcharARB **, const GLint *)) {
+static inline void SET_ShaderSourceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, const GLcharARB **, const GLint *)) {
    SET_by_offset(disp, _gloffset_ShaderSourceARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform1fARB)(GLint, GLfloat);
 #define CALL_Uniform1fARB(disp, parameters) \
     (* GET_Uniform1fARB(disp)) parameters
-static INLINE _glptr_Uniform1fARB GET_Uniform1fARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform1fARB GET_Uniform1fARB(struct _glapi_table *disp) {
    return (_glptr_Uniform1fARB) (GET_by_offset(disp, _gloffset_Uniform1fARB));
 }
 
-static INLINE void SET_Uniform1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat)) {
+static inline void SET_Uniform1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat)) {
    SET_by_offset(disp, _gloffset_Uniform1fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform1fvARB)(GLint, GLsizei, const GLfloat *);
 #define CALL_Uniform1fvARB(disp, parameters) \
     (* GET_Uniform1fvARB(disp)) parameters
-static INLINE _glptr_Uniform1fvARB GET_Uniform1fvARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform1fvARB GET_Uniform1fvARB(struct _glapi_table *disp) {
    return (_glptr_Uniform1fvARB) (GET_by_offset(disp, _gloffset_Uniform1fvARB));
 }
 
-static INLINE void SET_Uniform1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+static inline void SET_Uniform1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Uniform1fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform1iARB)(GLint, GLint);
 #define CALL_Uniform1iARB(disp, parameters) \
     (* GET_Uniform1iARB(disp)) parameters
-static INLINE _glptr_Uniform1iARB GET_Uniform1iARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform1iARB GET_Uniform1iARB(struct _glapi_table *disp) {
    return (_glptr_Uniform1iARB) (GET_by_offset(disp, _gloffset_Uniform1iARB));
 }
 
-static INLINE void SET_Uniform1iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+static inline void SET_Uniform1iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Uniform1iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform1ivARB)(GLint, GLsizei, const GLint *);
 #define CALL_Uniform1ivARB(disp, parameters) \
     (* GET_Uniform1ivARB(disp)) parameters
-static INLINE _glptr_Uniform1ivARB GET_Uniform1ivARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform1ivARB GET_Uniform1ivARB(struct _glapi_table *disp) {
    return (_glptr_Uniform1ivARB) (GET_by_offset(disp, _gloffset_Uniform1ivARB));
 }
 
-static INLINE void SET_Uniform1ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+static inline void SET_Uniform1ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
    SET_by_offset(disp, _gloffset_Uniform1ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform2fARB)(GLint, GLfloat, GLfloat);
 #define CALL_Uniform2fARB(disp, parameters) \
     (* GET_Uniform2fARB(disp)) parameters
-static INLINE _glptr_Uniform2fARB GET_Uniform2fARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform2fARB GET_Uniform2fARB(struct _glapi_table *disp) {
    return (_glptr_Uniform2fARB) (GET_by_offset(disp, _gloffset_Uniform2fARB));
 }
 
-static INLINE void SET_Uniform2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) {
+static inline void SET_Uniform2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Uniform2fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform2fvARB)(GLint, GLsizei, const GLfloat *);
 #define CALL_Uniform2fvARB(disp, parameters) \
     (* GET_Uniform2fvARB(disp)) parameters
-static INLINE _glptr_Uniform2fvARB GET_Uniform2fvARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform2fvARB GET_Uniform2fvARB(struct _glapi_table *disp) {
    return (_glptr_Uniform2fvARB) (GET_by_offset(disp, _gloffset_Uniform2fvARB));
 }
 
-static INLINE void SET_Uniform2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+static inline void SET_Uniform2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Uniform2fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform2iARB)(GLint, GLint, GLint);
 #define CALL_Uniform2iARB(disp, parameters) \
     (* GET_Uniform2iARB(disp)) parameters
-static INLINE _glptr_Uniform2iARB GET_Uniform2iARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform2iARB GET_Uniform2iARB(struct _glapi_table *disp) {
    return (_glptr_Uniform2iARB) (GET_by_offset(disp, _gloffset_Uniform2iARB));
 }
 
-static INLINE void SET_Uniform2iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_Uniform2iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Uniform2iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform2ivARB)(GLint, GLsizei, const GLint *);
 #define CALL_Uniform2ivARB(disp, parameters) \
     (* GET_Uniform2ivARB(disp)) parameters
-static INLINE _glptr_Uniform2ivARB GET_Uniform2ivARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform2ivARB GET_Uniform2ivARB(struct _glapi_table *disp) {
    return (_glptr_Uniform2ivARB) (GET_by_offset(disp, _gloffset_Uniform2ivARB));
 }
 
-static INLINE void SET_Uniform2ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+static inline void SET_Uniform2ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
    SET_by_offset(disp, _gloffset_Uniform2ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform3fARB)(GLint, GLfloat, GLfloat, GLfloat);
 #define CALL_Uniform3fARB(disp, parameters) \
     (* GET_Uniform3fARB(disp)) parameters
-static INLINE _glptr_Uniform3fARB GET_Uniform3fARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform3fARB GET_Uniform3fARB(struct _glapi_table *disp) {
    return (_glptr_Uniform3fARB) (GET_by_offset(disp, _gloffset_Uniform3fARB));
 }
 
-static INLINE void SET_Uniform3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Uniform3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Uniform3fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform3fvARB)(GLint, GLsizei, const GLfloat *);
 #define CALL_Uniform3fvARB(disp, parameters) \
     (* GET_Uniform3fvARB(disp)) parameters
-static INLINE _glptr_Uniform3fvARB GET_Uniform3fvARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform3fvARB GET_Uniform3fvARB(struct _glapi_table *disp) {
    return (_glptr_Uniform3fvARB) (GET_by_offset(disp, _gloffset_Uniform3fvARB));
 }
 
-static INLINE void SET_Uniform3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+static inline void SET_Uniform3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Uniform3fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform3iARB)(GLint, GLint, GLint, GLint);
 #define CALL_Uniform3iARB(disp, parameters) \
     (* GET_Uniform3iARB(disp)) parameters
-static INLINE _glptr_Uniform3iARB GET_Uniform3iARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform3iARB GET_Uniform3iARB(struct _glapi_table *disp) {
    return (_glptr_Uniform3iARB) (GET_by_offset(disp, _gloffset_Uniform3iARB));
 }
 
-static INLINE void SET_Uniform3iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_Uniform3iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Uniform3iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform3ivARB)(GLint, GLsizei, const GLint *);
 #define CALL_Uniform3ivARB(disp, parameters) \
     (* GET_Uniform3ivARB(disp)) parameters
-static INLINE _glptr_Uniform3ivARB GET_Uniform3ivARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform3ivARB GET_Uniform3ivARB(struct _glapi_table *disp) {
    return (_glptr_Uniform3ivARB) (GET_by_offset(disp, _gloffset_Uniform3ivARB));
 }
 
-static INLINE void SET_Uniform3ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+static inline void SET_Uniform3ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
    SET_by_offset(disp, _gloffset_Uniform3ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform4fARB)(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Uniform4fARB(disp, parameters) \
     (* GET_Uniform4fARB(disp)) parameters
-static INLINE _glptr_Uniform4fARB GET_Uniform4fARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform4fARB GET_Uniform4fARB(struct _glapi_table *disp) {
    return (_glptr_Uniform4fARB) (GET_by_offset(disp, _gloffset_Uniform4fARB));
 }
 
-static INLINE void SET_Uniform4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_Uniform4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_Uniform4fARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform4fvARB)(GLint, GLsizei, const GLfloat *);
 #define CALL_Uniform4fvARB(disp, parameters) \
     (* GET_Uniform4fvARB(disp)) parameters
-static INLINE _glptr_Uniform4fvARB GET_Uniform4fvARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform4fvARB GET_Uniform4fvARB(struct _glapi_table *disp) {
    return (_glptr_Uniform4fvARB) (GET_by_offset(disp, _gloffset_Uniform4fvARB));
 }
 
-static INLINE void SET_Uniform4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+static inline void SET_Uniform4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_Uniform4fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform4iARB)(GLint, GLint, GLint, GLint, GLint);
 #define CALL_Uniform4iARB(disp, parameters) \
     (* GET_Uniform4iARB(disp)) parameters
-static INLINE _glptr_Uniform4iARB GET_Uniform4iARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform4iARB GET_Uniform4iARB(struct _glapi_table *disp) {
    return (_glptr_Uniform4iARB) (GET_by_offset(disp, _gloffset_Uniform4iARB));
 }
 
-static INLINE void SET_Uniform4iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) {
+static inline void SET_Uniform4iARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_Uniform4iARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform4ivARB)(GLint, GLsizei, const GLint *);
 #define CALL_Uniform4ivARB(disp, parameters) \
     (* GET_Uniform4ivARB(disp)) parameters
-static INLINE _glptr_Uniform4ivARB GET_Uniform4ivARB(struct _glapi_table *disp) {
+static inline _glptr_Uniform4ivARB GET_Uniform4ivARB(struct _glapi_table *disp) {
    return (_glptr_Uniform4ivARB) (GET_by_offset(disp, _gloffset_Uniform4ivARB));
 }
 
-static INLINE void SET_Uniform4ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+static inline void SET_Uniform4ivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
    SET_by_offset(disp, _gloffset_Uniform4ivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix2fvARB)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix2fvARB(disp, parameters) \
     (* GET_UniformMatrix2fvARB(disp)) parameters
-static INLINE _glptr_UniformMatrix2fvARB GET_UniformMatrix2fvARB(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix2fvARB GET_UniformMatrix2fvARB(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix2fvARB) (GET_by_offset(disp, _gloffset_UniformMatrix2fvARB));
 }
 
-static INLINE void SET_UniformMatrix2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix2fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix3fvARB)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix3fvARB(disp, parameters) \
     (* GET_UniformMatrix3fvARB(disp)) parameters
-static INLINE _glptr_UniformMatrix3fvARB GET_UniformMatrix3fvARB(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix3fvARB GET_UniformMatrix3fvARB(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix3fvARB) (GET_by_offset(disp, _gloffset_UniformMatrix3fvARB));
 }
 
-static INLINE void SET_UniformMatrix3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix3fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UniformMatrix4fvARB)(GLint, GLsizei, GLboolean, const GLfloat *);
 #define CALL_UniformMatrix4fvARB(disp, parameters) \
     (* GET_UniformMatrix4fvARB(disp)) parameters
-static INLINE _glptr_UniformMatrix4fvARB GET_UniformMatrix4fvARB(struct _glapi_table *disp) {
+static inline _glptr_UniformMatrix4fvARB GET_UniformMatrix4fvARB(struct _glapi_table *disp) {
    return (_glptr_UniformMatrix4fvARB) (GET_by_offset(disp, _gloffset_UniformMatrix4fvARB));
 }
 
-static INLINE void SET_UniformMatrix4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+static inline void SET_UniformMatrix4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_UniformMatrix4fvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UseProgramObjectARB)(GLhandleARB);
 #define CALL_UseProgramObjectARB(disp, parameters) \
     (* GET_UseProgramObjectARB(disp)) parameters
-static INLINE _glptr_UseProgramObjectARB GET_UseProgramObjectARB(struct _glapi_table *disp) {
+static inline _glptr_UseProgramObjectARB GET_UseProgramObjectARB(struct _glapi_table *disp) {
    return (_glptr_UseProgramObjectARB) (GET_by_offset(disp, _gloffset_UseProgramObjectARB));
 }
 
-static INLINE void SET_UseProgramObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
+static inline void SET_UseProgramObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
    SET_by_offset(disp, _gloffset_UseProgramObjectARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ValidateProgramARB)(GLhandleARB);
 #define CALL_ValidateProgramARB(disp, parameters) \
     (* GET_ValidateProgramARB(disp)) parameters
-static INLINE _glptr_ValidateProgramARB GET_ValidateProgramARB(struct _glapi_table *disp) {
+static inline _glptr_ValidateProgramARB GET_ValidateProgramARB(struct _glapi_table *disp) {
    return (_glptr_ValidateProgramARB) (GET_by_offset(disp, _gloffset_ValidateProgramARB));
 }
 
-static INLINE void SET_ValidateProgramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
+static inline void SET_ValidateProgramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) {
    SET_by_offset(disp, _gloffset_ValidateProgramARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindAttribLocationARB)(GLhandleARB, GLuint, const GLcharARB *);
 #define CALL_BindAttribLocationARB(disp, parameters) \
     (* GET_BindAttribLocationARB(disp)) parameters
-static INLINE _glptr_BindAttribLocationARB GET_BindAttribLocationARB(struct _glapi_table *disp) {
+static inline _glptr_BindAttribLocationARB GET_BindAttribLocationARB(struct _glapi_table *disp) {
    return (_glptr_BindAttribLocationARB) (GET_by_offset(disp, _gloffset_BindAttribLocationARB));
 }
 
-static INLINE void SET_BindAttribLocationARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLuint, const GLcharARB *)) {
+static inline void SET_BindAttribLocationARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLuint, const GLcharARB *)) {
    SET_by_offset(disp, _gloffset_BindAttribLocationARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetActiveAttribARB)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
 #define CALL_GetActiveAttribARB(disp, parameters) \
     (* GET_GetActiveAttribARB(disp)) parameters
-static INLINE _glptr_GetActiveAttribARB GET_GetActiveAttribARB(struct _glapi_table *disp) {
+static inline _glptr_GetActiveAttribARB GET_GetActiveAttribARB(struct _glapi_table *disp) {
    return (_glptr_GetActiveAttribARB) (GET_by_offset(disp, _gloffset_GetActiveAttribARB));
 }
 
-static INLINE void SET_GetActiveAttribARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)) {
+static inline void SET_GetActiveAttribARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)) {
    SET_by_offset(disp, _gloffset_GetActiveAttribARB, fn);
 }
 
 typedef GLint (GLAPIENTRYP _glptr_GetAttribLocationARB)(GLhandleARB, const GLcharARB *);
 #define CALL_GetAttribLocationARB(disp, parameters) \
     (* GET_GetAttribLocationARB(disp)) parameters
-static INLINE _glptr_GetAttribLocationARB GET_GetAttribLocationARB(struct _glapi_table *disp) {
+static inline _glptr_GetAttribLocationARB GET_GetAttribLocationARB(struct _glapi_table *disp) {
    return (_glptr_GetAttribLocationARB) (GET_by_offset(disp, _gloffset_GetAttribLocationARB));
 }
 
-static INLINE void SET_GetAttribLocationARB(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLhandleARB, const GLcharARB *)) {
+static inline void SET_GetAttribLocationARB(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLhandleARB, const GLcharARB *)) {
    SET_by_offset(disp, _gloffset_GetAttribLocationARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawBuffersARB)(GLsizei, const GLenum *);
 #define CALL_DrawBuffersARB(disp, parameters) \
     (* GET_DrawBuffersARB(disp)) parameters
-static INLINE _glptr_DrawBuffersARB GET_DrawBuffersARB(struct _glapi_table *disp) {
+static inline _glptr_DrawBuffersARB GET_DrawBuffersARB(struct _glapi_table *disp) {
    return (_glptr_DrawBuffersARB) (GET_by_offset(disp, _gloffset_DrawBuffersARB));
 }
 
-static INLINE void SET_DrawBuffersARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLenum *)) {
+static inline void SET_DrawBuffersARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLenum *)) {
    SET_by_offset(disp, _gloffset_DrawBuffersARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClampColorARB)(GLenum, GLenum);
 #define CALL_ClampColorARB(disp, parameters) \
     (* GET_ClampColorARB(disp)) parameters
-static INLINE _glptr_ClampColorARB GET_ClampColorARB(struct _glapi_table *disp) {
+static inline _glptr_ClampColorARB GET_ClampColorARB(struct _glapi_table *disp) {
    return (_glptr_ClampColorARB) (GET_by_offset(disp, _gloffset_ClampColorARB));
 }
 
-static INLINE void SET_ClampColorARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_ClampColorARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_ClampColorARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawArraysInstancedARB)(GLenum, GLint, GLsizei, GLsizei);
 #define CALL_DrawArraysInstancedARB(disp, parameters) \
     (* GET_DrawArraysInstancedARB(disp)) parameters
-static INLINE _glptr_DrawArraysInstancedARB GET_DrawArraysInstancedARB(struct _glapi_table *disp) {
+static inline _glptr_DrawArraysInstancedARB GET_DrawArraysInstancedARB(struct _glapi_table *disp) {
    return (_glptr_DrawArraysInstancedARB) (GET_by_offset(disp, _gloffset_DrawArraysInstancedARB));
 }
 
-static INLINE void SET_DrawArraysInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLsizei)) {
+static inline void SET_DrawArraysInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_DrawArraysInstancedARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedARB)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
 #define CALL_DrawElementsInstancedARB(disp, parameters) \
     (* GET_DrawElementsInstancedARB(disp)) parameters
-static INLINE _glptr_DrawElementsInstancedARB GET_DrawElementsInstancedARB(struct _glapi_table *disp) {
+static inline _glptr_DrawElementsInstancedARB GET_DrawElementsInstancedARB(struct _glapi_table *disp) {
    return (_glptr_DrawElementsInstancedARB) (GET_by_offset(disp, _gloffset_DrawElementsInstancedARB));
 }
 
-static INLINE void SET_DrawElementsInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei)) {
+static inline void SET_DrawElementsInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei)) {
    SET_by_offset(disp, _gloffset_DrawElementsInstancedARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RenderbufferStorageMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
 #define CALL_RenderbufferStorageMultisample(disp, parameters) \
     (* GET_RenderbufferStorageMultisample(disp)) parameters
-static INLINE _glptr_RenderbufferStorageMultisample GET_RenderbufferStorageMultisample(struct _glapi_table *disp) {
+static inline _glptr_RenderbufferStorageMultisample GET_RenderbufferStorageMultisample(struct _glapi_table *disp) {
    return (_glptr_RenderbufferStorageMultisample) (GET_by_offset(disp, _gloffset_RenderbufferStorageMultisample));
 }
 
-static INLINE void SET_RenderbufferStorageMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
+static inline void SET_RenderbufferStorageMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_RenderbufferStorageMultisample, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTextureARB)(GLenum, GLenum, GLuint, GLint);
 #define CALL_FramebufferTextureARB(disp, parameters) \
     (* GET_FramebufferTextureARB(disp)) parameters
-static INLINE _glptr_FramebufferTextureARB GET_FramebufferTextureARB(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTextureARB GET_FramebufferTextureARB(struct _glapi_table *disp) {
    return (_glptr_FramebufferTextureARB) (GET_by_offset(disp, _gloffset_FramebufferTextureARB));
 }
 
-static INLINE void SET_FramebufferTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) {
+static inline void SET_FramebufferTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) {
    SET_by_offset(disp, _gloffset_FramebufferTextureARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTextureFaceARB)(GLenum, GLenum, GLuint, GLint, GLenum);
 #define CALL_FramebufferTextureFaceARB(disp, parameters) \
     (* GET_FramebufferTextureFaceARB(disp)) parameters
-static INLINE _glptr_FramebufferTextureFaceARB GET_FramebufferTextureFaceARB(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTextureFaceARB GET_FramebufferTextureFaceARB(struct _glapi_table *disp) {
    return (_glptr_FramebufferTextureFaceARB) (GET_by_offset(disp, _gloffset_FramebufferTextureFaceARB));
 }
 
-static INLINE void SET_FramebufferTextureFaceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLenum)) {
+static inline void SET_FramebufferTextureFaceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLenum)) {
    SET_by_offset(disp, _gloffset_FramebufferTextureFaceARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramParameteriARB)(GLuint, GLenum, GLint);
 #define CALL_ProgramParameteriARB(disp, parameters) \
     (* GET_ProgramParameteriARB(disp)) parameters
-static INLINE _glptr_ProgramParameteriARB GET_ProgramParameteriARB(struct _glapi_table *disp) {
+static inline _glptr_ProgramParameteriARB GET_ProgramParameteriARB(struct _glapi_table *disp) {
    return (_glptr_ProgramParameteriARB) (GET_by_offset(disp, _gloffset_ProgramParameteriARB));
 }
 
-static INLINE void SET_ProgramParameteriARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
+static inline void SET_ProgramParameteriARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_ProgramParameteriARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribDivisorARB)(GLuint, GLuint);
 #define CALL_VertexAttribDivisorARB(disp, parameters) \
     (* GET_VertexAttribDivisorARB(disp)) parameters
-static INLINE _glptr_VertexAttribDivisorARB GET_VertexAttribDivisorARB(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribDivisorARB GET_VertexAttribDivisorARB(struct _glapi_table *disp) {
    return (_glptr_VertexAttribDivisorARB) (GET_by_offset(disp, _gloffset_VertexAttribDivisorARB));
 }
 
-static INLINE void SET_VertexAttribDivisorARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+static inline void SET_VertexAttribDivisorARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribDivisorARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr);
 #define CALL_FlushMappedBufferRange(disp, parameters) \
     (* GET_FlushMappedBufferRange(disp)) parameters
-static INLINE _glptr_FlushMappedBufferRange GET_FlushMappedBufferRange(struct _glapi_table *disp) {
+static inline _glptr_FlushMappedBufferRange GET_FlushMappedBufferRange(struct _glapi_table *disp) {
    return (_glptr_FlushMappedBufferRange) (GET_by_offset(disp, _gloffset_FlushMappedBufferRange));
 }
 
-static INLINE void SET_FlushMappedBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) {
+static inline void SET_FlushMappedBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) {
    SET_by_offset(disp, _gloffset_FlushMappedBufferRange, fn);
 }
 
 typedef GLvoid * (GLAPIENTRYP _glptr_MapBufferRange)(GLenum, GLintptr, GLsizeiptr, GLbitfield);
 #define CALL_MapBufferRange(disp, parameters) \
     (* GET_MapBufferRange(disp)) parameters
-static INLINE _glptr_MapBufferRange GET_MapBufferRange(struct _glapi_table *disp) {
+static inline _glptr_MapBufferRange GET_MapBufferRange(struct _glapi_table *disp) {
    return (_glptr_MapBufferRange) (GET_by_offset(disp, _gloffset_MapBufferRange));
 }
 
-static INLINE void SET_MapBufferRange(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, GLbitfield)) {
+static inline void SET_MapBufferRange(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, GLbitfield)) {
    SET_by_offset(disp, _gloffset_MapBufferRange, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexBufferARB)(GLenum, GLenum, GLuint);
 #define CALL_TexBufferARB(disp, parameters) \
     (* GET_TexBufferARB(disp)) parameters
-static INLINE _glptr_TexBufferARB GET_TexBufferARB(struct _glapi_table *disp) {
+static inline _glptr_TexBufferARB GET_TexBufferARB(struct _glapi_table *disp) {
    return (_glptr_TexBufferARB) (GET_by_offset(disp, _gloffset_TexBufferARB));
 }
 
-static INLINE void SET_TexBufferARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+static inline void SET_TexBufferARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_TexBufferARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindVertexArray)(GLuint);
 #define CALL_BindVertexArray(disp, parameters) \
     (* GET_BindVertexArray(disp)) parameters
-static INLINE _glptr_BindVertexArray GET_BindVertexArray(struct _glapi_table *disp) {
+static inline _glptr_BindVertexArray GET_BindVertexArray(struct _glapi_table *disp) {
    return (_glptr_BindVertexArray) (GET_by_offset(disp, _gloffset_BindVertexArray));
 }
 
-static INLINE void SET_BindVertexArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_BindVertexArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_BindVertexArray, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenVertexArrays)(GLsizei, GLuint *);
 #define CALL_GenVertexArrays(disp, parameters) \
     (* GET_GenVertexArrays(disp)) parameters
-static INLINE _glptr_GenVertexArrays GET_GenVertexArrays(struct _glapi_table *disp) {
+static inline _glptr_GenVertexArrays GET_GenVertexArrays(struct _glapi_table *disp) {
    return (_glptr_GenVertexArrays) (GET_by_offset(disp, _gloffset_GenVertexArrays));
 }
 
-static INLINE void SET_GenVertexArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenVertexArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenVertexArrays, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CopyBufferSubData)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr);
 #define CALL_CopyBufferSubData(disp, parameters) \
     (* GET_CopyBufferSubData(disp)) parameters
-static INLINE _glptr_CopyBufferSubData GET_CopyBufferSubData(struct _glapi_table *disp) {
+static inline _glptr_CopyBufferSubData GET_CopyBufferSubData(struct _glapi_table *disp) {
    return (_glptr_CopyBufferSubData) (GET_by_offset(disp, _gloffset_CopyBufferSubData));
 }
 
-static INLINE void SET_CopyBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)) {
+static inline void SET_CopyBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)) {
    SET_by_offset(disp, _gloffset_CopyBufferSubData, fn);
 }
 
 typedef GLenum (GLAPIENTRYP _glptr_ClientWaitSync)(GLsync, GLbitfield, GLuint64);
 #define CALL_ClientWaitSync(disp, parameters) \
     (* GET_ClientWaitSync(disp)) parameters
-static INLINE _glptr_ClientWaitSync GET_ClientWaitSync(struct _glapi_table *disp) {
+static inline _glptr_ClientWaitSync GET_ClientWaitSync(struct _glapi_table *disp) {
    return (_glptr_ClientWaitSync) (GET_by_offset(disp, _gloffset_ClientWaitSync));
 }
 
-static INLINE void SET_ClientWaitSync(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLsync, GLbitfield, GLuint64)) {
+static inline void SET_ClientWaitSync(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLsync, GLbitfield, GLuint64)) {
    SET_by_offset(disp, _gloffset_ClientWaitSync, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteSync)(GLsync);
 #define CALL_DeleteSync(disp, parameters) \
     (* GET_DeleteSync(disp)) parameters
-static INLINE _glptr_DeleteSync GET_DeleteSync(struct _glapi_table *disp) {
+static inline _glptr_DeleteSync GET_DeleteSync(struct _glapi_table *disp) {
    return (_glptr_DeleteSync) (GET_by_offset(disp, _gloffset_DeleteSync));
 }
 
-static INLINE void SET_DeleteSync(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync)) {
+static inline void SET_DeleteSync(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync)) {
    SET_by_offset(disp, _gloffset_DeleteSync, fn);
 }
 
 typedef GLsync (GLAPIENTRYP _glptr_FenceSync)(GLenum, GLbitfield);
 #define CALL_FenceSync(disp, parameters) \
     (* GET_FenceSync(disp)) parameters
-static INLINE _glptr_FenceSync GET_FenceSync(struct _glapi_table *disp) {
+static inline _glptr_FenceSync GET_FenceSync(struct _glapi_table *disp) {
    return (_glptr_FenceSync) (GET_by_offset(disp, _gloffset_FenceSync));
 }
 
-static INLINE void SET_FenceSync(struct _glapi_table *disp, GLsync (GLAPIENTRYP fn)(GLenum, GLbitfield)) {
+static inline void SET_FenceSync(struct _glapi_table *disp, GLsync (GLAPIENTRYP fn)(GLenum, GLbitfield)) {
    SET_by_offset(disp, _gloffset_FenceSync, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetInteger64v)(GLenum, GLint64 *);
 #define CALL_GetInteger64v(disp, parameters) \
     (* GET_GetInteger64v(disp)) parameters
-static INLINE _glptr_GetInteger64v GET_GetInteger64v(struct _glapi_table *disp) {
+static inline _glptr_GetInteger64v GET_GetInteger64v(struct _glapi_table *disp) {
    return (_glptr_GetInteger64v) (GET_by_offset(disp, _gloffset_GetInteger64v));
 }
 
-static INLINE void SET_GetInteger64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint64 *)) {
+static inline void SET_GetInteger64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint64 *)) {
    SET_by_offset(disp, _gloffset_GetInteger64v, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetSynciv)(GLsync, GLenum, GLsizei, GLsizei *, GLint *);
 #define CALL_GetSynciv(disp, parameters) \
     (* GET_GetSynciv(disp)) parameters
-static INLINE _glptr_GetSynciv GET_GetSynciv(struct _glapi_table *disp) {
+static inline _glptr_GetSynciv GET_GetSynciv(struct _glapi_table *disp) {
    return (_glptr_GetSynciv) (GET_by_offset(disp, _gloffset_GetSynciv));
 }
 
-static INLINE void SET_GetSynciv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync, GLenum, GLsizei, GLsizei *, GLint *)) {
+static inline void SET_GetSynciv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync, GLenum, GLsizei, GLsizei *, GLint *)) {
    SET_by_offset(disp, _gloffset_GetSynciv, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsSync)(GLsync);
 #define CALL_IsSync(disp, parameters) \
     (* GET_IsSync(disp)) parameters
-static INLINE _glptr_IsSync GET_IsSync(struct _glapi_table *disp) {
+static inline _glptr_IsSync GET_IsSync(struct _glapi_table *disp) {
    return (_glptr_IsSync) (GET_by_offset(disp, _gloffset_IsSync));
 }
 
-static INLINE void SET_IsSync(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsync)) {
+static inline void SET_IsSync(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsync)) {
    SET_by_offset(disp, _gloffset_IsSync, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WaitSync)(GLsync, GLbitfield, GLuint64);
 #define CALL_WaitSync(disp, parameters) \
     (* GET_WaitSync(disp)) parameters
-static INLINE _glptr_WaitSync GET_WaitSync(struct _glapi_table *disp) {
+static inline _glptr_WaitSync GET_WaitSync(struct _glapi_table *disp) {
    return (_glptr_WaitSync) (GET_by_offset(disp, _gloffset_WaitSync));
 }
 
-static INLINE void SET_WaitSync(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync, GLbitfield, GLuint64)) {
+static inline void SET_WaitSync(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync, GLbitfield, GLuint64)) {
    SET_by_offset(disp, _gloffset_WaitSync, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawElementsBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLint);
 #define CALL_DrawElementsBaseVertex(disp, parameters) \
     (* GET_DrawElementsBaseVertex(disp)) parameters
-static INLINE _glptr_DrawElementsBaseVertex GET_DrawElementsBaseVertex(struct _glapi_table *disp) {
+static inline _glptr_DrawElementsBaseVertex GET_DrawElementsBaseVertex(struct _glapi_table *disp) {
    return (_glptr_DrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsBaseVertex));
 }
 
-static INLINE void SET_DrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLint)) {
+static inline void SET_DrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLint)) {
    SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint);
 #define CALL_DrawElementsInstancedBaseVertex(disp, parameters) \
     (* GET_DrawElementsInstancedBaseVertex(disp)) parameters
-static INLINE _glptr_DrawElementsInstancedBaseVertex GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp) {
+static inline _glptr_DrawElementsInstancedBaseVertex GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp) {
    return (_glptr_DrawElementsInstancedBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex));
 }
 
-static INLINE void SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint)) {
+static inline void SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint)) {
    SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawRangeElementsBaseVertex)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint);
 #define CALL_DrawRangeElementsBaseVertex(disp, parameters) \
     (* GET_DrawRangeElementsBaseVertex(disp)) parameters
-static INLINE _glptr_DrawRangeElementsBaseVertex GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp) {
+static inline _glptr_DrawRangeElementsBaseVertex GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp) {
    return (_glptr_DrawRangeElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex));
 }
 
-static INLINE void SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint)) {
+static inline void SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint)) {
    SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *);
 #define CALL_MultiDrawElementsBaseVertex(disp, parameters) \
     (* GET_MultiDrawElementsBaseVertex(disp)) parameters
-static INLINE _glptr_MultiDrawElementsBaseVertex GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp) {
+static inline _glptr_MultiDrawElementsBaseVertex GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp) {
    return (_glptr_MultiDrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex));
 }
 
-static INLINE void SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *)) {
+static inline void SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *)) {
    SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateiARB)(GLuint, GLenum, GLenum);
 #define CALL_BlendEquationSeparateiARB(disp, parameters) \
     (* GET_BlendEquationSeparateiARB(disp)) parameters
-static INLINE _glptr_BlendEquationSeparateiARB GET_BlendEquationSeparateiARB(struct _glapi_table *disp) {
+static inline _glptr_BlendEquationSeparateiARB GET_BlendEquationSeparateiARB(struct _glapi_table *disp) {
    return (_glptr_BlendEquationSeparateiARB) (GET_by_offset(disp, _gloffset_BlendEquationSeparateiARB));
 }
 
-static INLINE void SET_BlendEquationSeparateiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) {
+static inline void SET_BlendEquationSeparateiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendEquationSeparateiARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendEquationiARB)(GLuint, GLenum);
 #define CALL_BlendEquationiARB(disp, parameters) \
     (* GET_BlendEquationiARB(disp)) parameters
-static INLINE _glptr_BlendEquationiARB GET_BlendEquationiARB(struct _glapi_table *disp) {
+static inline _glptr_BlendEquationiARB GET_BlendEquationiARB(struct _glapi_table *disp) {
    return (_glptr_BlendEquationiARB) (GET_by_offset(disp, _gloffset_BlendEquationiARB));
 }
 
-static INLINE void SET_BlendEquationiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
+static inline void SET_BlendEquationiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendEquationiARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateiARB)(GLuint, GLenum, GLenum, GLenum, GLenum);
 #define CALL_BlendFuncSeparateiARB(disp, parameters) \
     (* GET_BlendFuncSeparateiARB(disp)) parameters
-static INLINE _glptr_BlendFuncSeparateiARB GET_BlendFuncSeparateiARB(struct _glapi_table *disp) {
+static inline _glptr_BlendFuncSeparateiARB GET_BlendFuncSeparateiARB(struct _glapi_table *disp) {
    return (_glptr_BlendFuncSeparateiARB) (GET_by_offset(disp, _gloffset_BlendFuncSeparateiARB));
 }
 
-static INLINE void SET_BlendFuncSeparateiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum, GLenum, GLenum)) {
+static inline void SET_BlendFuncSeparateiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendFuncSeparateiARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendFunciARB)(GLuint, GLenum, GLenum);
 #define CALL_BlendFunciARB(disp, parameters) \
     (* GET_BlendFunciARB(disp)) parameters
-static INLINE _glptr_BlendFunciARB GET_BlendFunciARB(struct _glapi_table *disp) {
+static inline _glptr_BlendFunciARB GET_BlendFunciARB(struct _glapi_table *disp) {
    return (_glptr_BlendFunciARB) (GET_by_offset(disp, _gloffset_BlendFunciARB));
 }
 
-static INLINE void SET_BlendFunciARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) {
+static inline void SET_BlendFunciARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendFunciARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindSampler)(GLuint, GLuint);
 #define CALL_BindSampler(disp, parameters) \
     (* GET_BindSampler(disp)) parameters
-static INLINE _glptr_BindSampler GET_BindSampler(struct _glapi_table *disp) {
+static inline _glptr_BindSampler GET_BindSampler(struct _glapi_table *disp) {
    return (_glptr_BindSampler) (GET_by_offset(disp, _gloffset_BindSampler));
 }
 
-static INLINE void SET_BindSampler(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+static inline void SET_BindSampler(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_BindSampler, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteSamplers)(GLsizei, const GLuint *);
 #define CALL_DeleteSamplers(disp, parameters) \
     (* GET_DeleteSamplers(disp)) parameters
-static INLINE _glptr_DeleteSamplers GET_DeleteSamplers(struct _glapi_table *disp) {
+static inline _glptr_DeleteSamplers GET_DeleteSamplers(struct _glapi_table *disp) {
    return (_glptr_DeleteSamplers) (GET_by_offset(disp, _gloffset_DeleteSamplers));
 }
 
-static INLINE void SET_DeleteSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteSamplers, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenSamplers)(GLsizei, GLuint *);
 #define CALL_GenSamplers(disp, parameters) \
     (* GET_GenSamplers(disp)) parameters
-static INLINE _glptr_GenSamplers GET_GenSamplers(struct _glapi_table *disp) {
+static inline _glptr_GenSamplers GET_GenSamplers(struct _glapi_table *disp) {
    return (_glptr_GenSamplers) (GET_by_offset(disp, _gloffset_GenSamplers));
 }
 
-static INLINE void SET_GenSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenSamplers, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIiv)(GLuint, GLenum, GLint *);
 #define CALL_GetSamplerParameterIiv(disp, parameters) \
     (* GET_GetSamplerParameterIiv(disp)) parameters
-static INLINE _glptr_GetSamplerParameterIiv GET_GetSamplerParameterIiv(struct _glapi_table *disp) {
+static inline _glptr_GetSamplerParameterIiv GET_GetSamplerParameterIiv(struct _glapi_table *disp) {
    return (_glptr_GetSamplerParameterIiv) (GET_by_offset(disp, _gloffset_GetSamplerParameterIiv));
 }
 
-static INLINE void SET_GetSamplerParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetSamplerParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetSamplerParameterIiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIuiv)(GLuint, GLenum, GLuint *);
 #define CALL_GetSamplerParameterIuiv(disp, parameters) \
     (* GET_GetSamplerParameterIuiv(disp)) parameters
-static INLINE _glptr_GetSamplerParameterIuiv GET_GetSamplerParameterIuiv(struct _glapi_table *disp) {
+static inline _glptr_GetSamplerParameterIuiv GET_GetSamplerParameterIuiv(struct _glapi_table *disp) {
    return (_glptr_GetSamplerParameterIuiv) (GET_by_offset(disp, _gloffset_GetSamplerParameterIuiv));
 }
 
-static INLINE void SET_GetSamplerParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
+static inline void SET_GetSamplerParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetSamplerParameterIuiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetSamplerParameterfv)(GLuint, GLenum, GLfloat *);
 #define CALL_GetSamplerParameterfv(disp, parameters) \
     (* GET_GetSamplerParameterfv(disp)) parameters
-static INLINE _glptr_GetSamplerParameterfv GET_GetSamplerParameterfv(struct _glapi_table *disp) {
+static inline _glptr_GetSamplerParameterfv GET_GetSamplerParameterfv(struct _glapi_table *disp) {
    return (_glptr_GetSamplerParameterfv) (GET_by_offset(disp, _gloffset_GetSamplerParameterfv));
 }
 
-static INLINE void SET_GetSamplerParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
+static inline void SET_GetSamplerParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetSamplerParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetSamplerParameteriv)(GLuint, GLenum, GLint *);
 #define CALL_GetSamplerParameteriv(disp, parameters) \
     (* GET_GetSamplerParameteriv(disp)) parameters
-static INLINE _glptr_GetSamplerParameteriv GET_GetSamplerParameteriv(struct _glapi_table *disp) {
+static inline _glptr_GetSamplerParameteriv GET_GetSamplerParameteriv(struct _glapi_table *disp) {
    return (_glptr_GetSamplerParameteriv) (GET_by_offset(disp, _gloffset_GetSamplerParameteriv));
 }
 
-static INLINE void SET_GetSamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetSamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetSamplerParameteriv, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsSampler)(GLuint);
 #define CALL_IsSampler(disp, parameters) \
     (* GET_IsSampler(disp)) parameters
-static INLINE _glptr_IsSampler GET_IsSampler(struct _glapi_table *disp) {
+static inline _glptr_IsSampler GET_IsSampler(struct _glapi_table *disp) {
    return (_glptr_IsSampler) (GET_by_offset(disp, _gloffset_IsSampler));
 }
 
-static INLINE void SET_IsSampler(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsSampler(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsSampler, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplerParameterIiv)(GLuint, GLenum, const GLint *);
 #define CALL_SamplerParameterIiv(disp, parameters) \
     (* GET_SamplerParameterIiv(disp)) parameters
-static INLINE _glptr_SamplerParameterIiv GET_SamplerParameterIiv(struct _glapi_table *disp) {
+static inline _glptr_SamplerParameterIiv GET_SamplerParameterIiv(struct _glapi_table *disp) {
    return (_glptr_SamplerParameterIiv) (GET_by_offset(disp, _gloffset_SamplerParameterIiv));
 }
 
-static INLINE void SET_SamplerParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
+static inline void SET_SamplerParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_SamplerParameterIiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplerParameterIuiv)(GLuint, GLenum, const GLuint *);
 #define CALL_SamplerParameterIuiv(disp, parameters) \
     (* GET_SamplerParameterIuiv(disp)) parameters
-static INLINE _glptr_SamplerParameterIuiv GET_SamplerParameterIuiv(struct _glapi_table *disp) {
+static inline _glptr_SamplerParameterIuiv GET_SamplerParameterIuiv(struct _glapi_table *disp) {
    return (_glptr_SamplerParameterIuiv) (GET_by_offset(disp, _gloffset_SamplerParameterIuiv));
 }
 
-static INLINE void SET_SamplerParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLuint *)) {
+static inline void SET_SamplerParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_SamplerParameterIuiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplerParameterf)(GLuint, GLenum, GLfloat);
 #define CALL_SamplerParameterf(disp, parameters) \
     (* GET_SamplerParameterf(disp)) parameters
-static INLINE _glptr_SamplerParameterf GET_SamplerParameterf(struct _glapi_table *disp) {
+static inline _glptr_SamplerParameterf GET_SamplerParameterf(struct _glapi_table *disp) {
    return (_glptr_SamplerParameterf) (GET_by_offset(disp, _gloffset_SamplerParameterf));
 }
 
-static INLINE void SET_SamplerParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat)) {
+static inline void SET_SamplerParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_SamplerParameterf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplerParameterfv)(GLuint, GLenum, const GLfloat *);
 #define CALL_SamplerParameterfv(disp, parameters) \
     (* GET_SamplerParameterfv(disp)) parameters
-static INLINE _glptr_SamplerParameterfv GET_SamplerParameterfv(struct _glapi_table *disp) {
+static inline _glptr_SamplerParameterfv GET_SamplerParameterfv(struct _glapi_table *disp) {
    return (_glptr_SamplerParameterfv) (GET_by_offset(disp, _gloffset_SamplerParameterfv));
 }
 
-static INLINE void SET_SamplerParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLfloat *)) {
+static inline void SET_SamplerParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_SamplerParameterfv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplerParameteri)(GLuint, GLenum, GLint);
 #define CALL_SamplerParameteri(disp, parameters) \
     (* GET_SamplerParameteri(disp)) parameters
-static INLINE _glptr_SamplerParameteri GET_SamplerParameteri(struct _glapi_table *disp) {
+static inline _glptr_SamplerParameteri GET_SamplerParameteri(struct _glapi_table *disp) {
    return (_glptr_SamplerParameteri) (GET_by_offset(disp, _gloffset_SamplerParameteri));
 }
 
-static INLINE void SET_SamplerParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
+static inline void SET_SamplerParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_SamplerParameteri, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplerParameteriv)(GLuint, GLenum, const GLint *);
 #define CALL_SamplerParameteriv(disp, parameters) \
     (* GET_SamplerParameteriv(disp)) parameters
-static INLINE _glptr_SamplerParameteriv GET_SamplerParameteriv(struct _glapi_table *disp) {
+static inline _glptr_SamplerParameteriv GET_SamplerParameteriv(struct _glapi_table *disp) {
    return (_glptr_SamplerParameteriv) (GET_by_offset(disp, _gloffset_SamplerParameteriv));
 }
 
-static INLINE void SET_SamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
+static inline void SET_SamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_SamplerParameteriv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorP3ui)(GLenum, GLuint);
 #define CALL_ColorP3ui(disp, parameters) \
     (* GET_ColorP3ui(disp)) parameters
-static INLINE _glptr_ColorP3ui GET_ColorP3ui(struct _glapi_table *disp) {
+static inline _glptr_ColorP3ui GET_ColorP3ui(struct _glapi_table *disp) {
    return (_glptr_ColorP3ui) (GET_by_offset(disp, _gloffset_ColorP3ui));
 }
 
-static INLINE void SET_ColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_ColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_ColorP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorP3uiv)(GLenum, const GLuint *);
 #define CALL_ColorP3uiv(disp, parameters) \
     (* GET_ColorP3uiv(disp)) parameters
-static INLINE _glptr_ColorP3uiv GET_ColorP3uiv(struct _glapi_table *disp) {
+static inline _glptr_ColorP3uiv GET_ColorP3uiv(struct _glapi_table *disp) {
    return (_glptr_ColorP3uiv) (GET_by_offset(disp, _gloffset_ColorP3uiv));
 }
 
-static INLINE void SET_ColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_ColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_ColorP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorP4ui)(GLenum, GLuint);
 #define CALL_ColorP4ui(disp, parameters) \
     (* GET_ColorP4ui(disp)) parameters
-static INLINE _glptr_ColorP4ui GET_ColorP4ui(struct _glapi_table *disp) {
+static inline _glptr_ColorP4ui GET_ColorP4ui(struct _glapi_table *disp) {
    return (_glptr_ColorP4ui) (GET_by_offset(disp, _gloffset_ColorP4ui));
 }
 
-static INLINE void SET_ColorP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_ColorP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_ColorP4ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorP4uiv)(GLenum, const GLuint *);
 #define CALL_ColorP4uiv(disp, parameters) \
     (* GET_ColorP4uiv(disp)) parameters
-static INLINE _glptr_ColorP4uiv GET_ColorP4uiv(struct _glapi_table *disp) {
+static inline _glptr_ColorP4uiv GET_ColorP4uiv(struct _glapi_table *disp) {
    return (_glptr_ColorP4uiv) (GET_by_offset(disp, _gloffset_ColorP4uiv));
 }
 
-static INLINE void SET_ColorP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_ColorP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_ColorP4uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP1ui(disp, parameters) \
     (* GET_MultiTexCoordP1ui(disp)) parameters
-static INLINE _glptr_MultiTexCoordP1ui GET_MultiTexCoordP1ui(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP1ui GET_MultiTexCoordP1ui(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP1ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP1ui));
 }
 
-static INLINE void SET_MultiTexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+static inline void SET_MultiTexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP1ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP1uiv(disp, parameters) \
     (* GET_MultiTexCoordP1uiv(disp)) parameters
-static INLINE _glptr_MultiTexCoordP1uiv GET_MultiTexCoordP1uiv(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP1uiv GET_MultiTexCoordP1uiv(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP1uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP1uiv));
 }
 
-static INLINE void SET_MultiTexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
+static inline void SET_MultiTexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP1uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP2ui(disp, parameters) \
     (* GET_MultiTexCoordP2ui(disp)) parameters
-static INLINE _glptr_MultiTexCoordP2ui GET_MultiTexCoordP2ui(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP2ui GET_MultiTexCoordP2ui(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP2ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP2ui));
 }
 
-static INLINE void SET_MultiTexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+static inline void SET_MultiTexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP2ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP2uiv(disp, parameters) \
     (* GET_MultiTexCoordP2uiv(disp)) parameters
-static INLINE _glptr_MultiTexCoordP2uiv GET_MultiTexCoordP2uiv(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP2uiv GET_MultiTexCoordP2uiv(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP2uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP2uiv));
 }
 
-static INLINE void SET_MultiTexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
+static inline void SET_MultiTexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP2uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP3ui(disp, parameters) \
     (* GET_MultiTexCoordP3ui(disp)) parameters
-static INLINE _glptr_MultiTexCoordP3ui GET_MultiTexCoordP3ui(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP3ui GET_MultiTexCoordP3ui(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP3ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP3ui));
 }
 
-static INLINE void SET_MultiTexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+static inline void SET_MultiTexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP3uiv(disp, parameters) \
     (* GET_MultiTexCoordP3uiv(disp)) parameters
-static INLINE _glptr_MultiTexCoordP3uiv GET_MultiTexCoordP3uiv(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP3uiv GET_MultiTexCoordP3uiv(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP3uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP3uiv));
 }
 
-static INLINE void SET_MultiTexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
+static inline void SET_MultiTexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP4ui(disp, parameters) \
     (* GET_MultiTexCoordP4ui(disp)) parameters
-static INLINE _glptr_MultiTexCoordP4ui GET_MultiTexCoordP4ui(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP4ui GET_MultiTexCoordP4ui(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP4ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP4ui));
 }
 
-static INLINE void SET_MultiTexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+static inline void SET_MultiTexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP4ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP4uiv(disp, parameters) \
     (* GET_MultiTexCoordP4uiv(disp)) parameters
-static INLINE _glptr_MultiTexCoordP4uiv GET_MultiTexCoordP4uiv(struct _glapi_table *disp) {
+static inline _glptr_MultiTexCoordP4uiv GET_MultiTexCoordP4uiv(struct _glapi_table *disp) {
    return (_glptr_MultiTexCoordP4uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP4uiv));
 }
 
-static INLINE void SET_MultiTexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
+static inline void SET_MultiTexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_MultiTexCoordP4uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_NormalP3ui)(GLenum, GLuint);
 #define CALL_NormalP3ui(disp, parameters) \
     (* GET_NormalP3ui(disp)) parameters
-static INLINE _glptr_NormalP3ui GET_NormalP3ui(struct _glapi_table *disp) {
+static inline _glptr_NormalP3ui GET_NormalP3ui(struct _glapi_table *disp) {
    return (_glptr_NormalP3ui) (GET_by_offset(disp, _gloffset_NormalP3ui));
 }
 
-static INLINE void SET_NormalP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_NormalP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_NormalP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_NormalP3uiv)(GLenum, const GLuint *);
 #define CALL_NormalP3uiv(disp, parameters) \
     (* GET_NormalP3uiv(disp)) parameters
-static INLINE _glptr_NormalP3uiv GET_NormalP3uiv(struct _glapi_table *disp) {
+static inline _glptr_NormalP3uiv GET_NormalP3uiv(struct _glapi_table *disp) {
    return (_glptr_NormalP3uiv) (GET_by_offset(disp, _gloffset_NormalP3uiv));
 }
 
-static INLINE void SET_NormalP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_NormalP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_NormalP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColorP3ui)(GLenum, GLuint);
 #define CALL_SecondaryColorP3ui(disp, parameters) \
     (* GET_SecondaryColorP3ui(disp)) parameters
-static INLINE _glptr_SecondaryColorP3ui GET_SecondaryColorP3ui(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColorP3ui GET_SecondaryColorP3ui(struct _glapi_table *disp) {
    return (_glptr_SecondaryColorP3ui) (GET_by_offset(disp, _gloffset_SecondaryColorP3ui));
 }
 
-static INLINE void SET_SecondaryColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_SecondaryColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_SecondaryColorP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColorP3uiv)(GLenum, const GLuint *);
 #define CALL_SecondaryColorP3uiv(disp, parameters) \
     (* GET_SecondaryColorP3uiv(disp)) parameters
-static INLINE _glptr_SecondaryColorP3uiv GET_SecondaryColorP3uiv(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColorP3uiv GET_SecondaryColorP3uiv(struct _glapi_table *disp) {
    return (_glptr_SecondaryColorP3uiv) (GET_by_offset(disp, _gloffset_SecondaryColorP3uiv));
 }
 
-static INLINE void SET_SecondaryColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_SecondaryColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_SecondaryColorP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP1ui)(GLenum, GLuint);
 #define CALL_TexCoordP1ui(disp, parameters) \
     (* GET_TexCoordP1ui(disp)) parameters
-static INLINE _glptr_TexCoordP1ui GET_TexCoordP1ui(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP1ui GET_TexCoordP1ui(struct _glapi_table *disp) {
    return (_glptr_TexCoordP1ui) (GET_by_offset(disp, _gloffset_TexCoordP1ui));
 }
 
-static INLINE void SET_TexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_TexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_TexCoordP1ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP1uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP1uiv(disp, parameters) \
     (* GET_TexCoordP1uiv(disp)) parameters
-static INLINE _glptr_TexCoordP1uiv GET_TexCoordP1uiv(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP1uiv GET_TexCoordP1uiv(struct _glapi_table *disp) {
    return (_glptr_TexCoordP1uiv) (GET_by_offset(disp, _gloffset_TexCoordP1uiv));
 }
 
-static INLINE void SET_TexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_TexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_TexCoordP1uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP2ui)(GLenum, GLuint);
 #define CALL_TexCoordP2ui(disp, parameters) \
     (* GET_TexCoordP2ui(disp)) parameters
-static INLINE _glptr_TexCoordP2ui GET_TexCoordP2ui(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP2ui GET_TexCoordP2ui(struct _glapi_table *disp) {
    return (_glptr_TexCoordP2ui) (GET_by_offset(disp, _gloffset_TexCoordP2ui));
 }
 
-static INLINE void SET_TexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_TexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_TexCoordP2ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP2uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP2uiv(disp, parameters) \
     (* GET_TexCoordP2uiv(disp)) parameters
-static INLINE _glptr_TexCoordP2uiv GET_TexCoordP2uiv(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP2uiv GET_TexCoordP2uiv(struct _glapi_table *disp) {
    return (_glptr_TexCoordP2uiv) (GET_by_offset(disp, _gloffset_TexCoordP2uiv));
 }
 
-static INLINE void SET_TexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_TexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_TexCoordP2uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP3ui)(GLenum, GLuint);
 #define CALL_TexCoordP3ui(disp, parameters) \
     (* GET_TexCoordP3ui(disp)) parameters
-static INLINE _glptr_TexCoordP3ui GET_TexCoordP3ui(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP3ui GET_TexCoordP3ui(struct _glapi_table *disp) {
    return (_glptr_TexCoordP3ui) (GET_by_offset(disp, _gloffset_TexCoordP3ui));
 }
 
-static INLINE void SET_TexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_TexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_TexCoordP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP3uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP3uiv(disp, parameters) \
     (* GET_TexCoordP3uiv(disp)) parameters
-static INLINE _glptr_TexCoordP3uiv GET_TexCoordP3uiv(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP3uiv GET_TexCoordP3uiv(struct _glapi_table *disp) {
    return (_glptr_TexCoordP3uiv) (GET_by_offset(disp, _gloffset_TexCoordP3uiv));
 }
 
-static INLINE void SET_TexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_TexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_TexCoordP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP4ui)(GLenum, GLuint);
 #define CALL_TexCoordP4ui(disp, parameters) \
     (* GET_TexCoordP4ui(disp)) parameters
-static INLINE _glptr_TexCoordP4ui GET_TexCoordP4ui(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP4ui GET_TexCoordP4ui(struct _glapi_table *disp) {
    return (_glptr_TexCoordP4ui) (GET_by_offset(disp, _gloffset_TexCoordP4ui));
 }
 
-static INLINE void SET_TexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_TexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_TexCoordP4ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordP4uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP4uiv(disp, parameters) \
     (* GET_TexCoordP4uiv(disp)) parameters
-static INLINE _glptr_TexCoordP4uiv GET_TexCoordP4uiv(struct _glapi_table *disp) {
+static inline _glptr_TexCoordP4uiv GET_TexCoordP4uiv(struct _glapi_table *disp) {
    return (_glptr_TexCoordP4uiv) (GET_by_offset(disp, _gloffset_TexCoordP4uiv));
 }
 
-static INLINE void SET_TexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_TexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_TexCoordP4uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP1ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP1ui(disp, parameters) \
     (* GET_VertexAttribP1ui(disp)) parameters
-static INLINE _glptr_VertexAttribP1ui GET_VertexAttribP1ui(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP1ui GET_VertexAttribP1ui(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP1ui) (GET_by_offset(disp, _gloffset_VertexAttribP1ui));
 }
 
-static INLINE void SET_VertexAttribP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
+static inline void SET_VertexAttribP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribP1ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP1uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP1uiv(disp, parameters) \
     (* GET_VertexAttribP1uiv(disp)) parameters
-static INLINE _glptr_VertexAttribP1uiv GET_VertexAttribP1uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP1uiv GET_VertexAttribP1uiv(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP1uiv) (GET_by_offset(disp, _gloffset_VertexAttribP1uiv));
 }
 
-static INLINE void SET_VertexAttribP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
+static inline void SET_VertexAttribP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribP1uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP2ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP2ui(disp, parameters) \
     (* GET_VertexAttribP2ui(disp)) parameters
-static INLINE _glptr_VertexAttribP2ui GET_VertexAttribP2ui(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP2ui GET_VertexAttribP2ui(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP2ui) (GET_by_offset(disp, _gloffset_VertexAttribP2ui));
 }
 
-static INLINE void SET_VertexAttribP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
+static inline void SET_VertexAttribP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribP2ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP2uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP2uiv(disp, parameters) \
     (* GET_VertexAttribP2uiv(disp)) parameters
-static INLINE _glptr_VertexAttribP2uiv GET_VertexAttribP2uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP2uiv GET_VertexAttribP2uiv(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP2uiv) (GET_by_offset(disp, _gloffset_VertexAttribP2uiv));
 }
 
-static INLINE void SET_VertexAttribP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
+static inline void SET_VertexAttribP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribP2uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP3ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP3ui(disp, parameters) \
     (* GET_VertexAttribP3ui(disp)) parameters
-static INLINE _glptr_VertexAttribP3ui GET_VertexAttribP3ui(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP3ui GET_VertexAttribP3ui(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP3ui) (GET_by_offset(disp, _gloffset_VertexAttribP3ui));
 }
 
-static INLINE void SET_VertexAttribP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
+static inline void SET_VertexAttribP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP3uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP3uiv(disp, parameters) \
     (* GET_VertexAttribP3uiv(disp)) parameters
-static INLINE _glptr_VertexAttribP3uiv GET_VertexAttribP3uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP3uiv GET_VertexAttribP3uiv(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP3uiv) (GET_by_offset(disp, _gloffset_VertexAttribP3uiv));
 }
 
-static INLINE void SET_VertexAttribP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
+static inline void SET_VertexAttribP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP4ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP4ui(disp, parameters) \
     (* GET_VertexAttribP4ui(disp)) parameters
-static INLINE _glptr_VertexAttribP4ui GET_VertexAttribP4ui(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP4ui GET_VertexAttribP4ui(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP4ui) (GET_by_offset(disp, _gloffset_VertexAttribP4ui));
 }
 
-static INLINE void SET_VertexAttribP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
+static inline void SET_VertexAttribP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribP4ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribP4uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP4uiv(disp, parameters) \
     (* GET_VertexAttribP4uiv(disp)) parameters
-static INLINE _glptr_VertexAttribP4uiv GET_VertexAttribP4uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribP4uiv GET_VertexAttribP4uiv(struct _glapi_table *disp) {
    return (_glptr_VertexAttribP4uiv) (GET_by_offset(disp, _gloffset_VertexAttribP4uiv));
 }
 
-static INLINE void SET_VertexAttribP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
+static inline void SET_VertexAttribP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribP4uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexP2ui)(GLenum, GLuint);
 #define CALL_VertexP2ui(disp, parameters) \
     (* GET_VertexP2ui(disp)) parameters
-static INLINE _glptr_VertexP2ui GET_VertexP2ui(struct _glapi_table *disp) {
+static inline _glptr_VertexP2ui GET_VertexP2ui(struct _glapi_table *disp) {
    return (_glptr_VertexP2ui) (GET_by_offset(disp, _gloffset_VertexP2ui));
 }
 
-static INLINE void SET_VertexP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_VertexP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexP2ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexP2uiv)(GLenum, const GLuint *);
 #define CALL_VertexP2uiv(disp, parameters) \
     (* GET_VertexP2uiv(disp)) parameters
-static INLINE _glptr_VertexP2uiv GET_VertexP2uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexP2uiv GET_VertexP2uiv(struct _glapi_table *disp) {
    return (_glptr_VertexP2uiv) (GET_by_offset(disp, _gloffset_VertexP2uiv));
 }
 
-static INLINE void SET_VertexP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_VertexP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexP2uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexP3ui)(GLenum, GLuint);
 #define CALL_VertexP3ui(disp, parameters) \
     (* GET_VertexP3ui(disp)) parameters
-static INLINE _glptr_VertexP3ui GET_VertexP3ui(struct _glapi_table *disp) {
+static inline _glptr_VertexP3ui GET_VertexP3ui(struct _glapi_table *disp) {
    return (_glptr_VertexP3ui) (GET_by_offset(disp, _gloffset_VertexP3ui));
 }
 
-static INLINE void SET_VertexP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_VertexP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexP3ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexP3uiv)(GLenum, const GLuint *);
 #define CALL_VertexP3uiv(disp, parameters) \
     (* GET_VertexP3uiv(disp)) parameters
-static INLINE _glptr_VertexP3uiv GET_VertexP3uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexP3uiv GET_VertexP3uiv(struct _glapi_table *disp) {
    return (_glptr_VertexP3uiv) (GET_by_offset(disp, _gloffset_VertexP3uiv));
 }
 
-static INLINE void SET_VertexP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_VertexP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexP3uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexP4ui)(GLenum, GLuint);
 #define CALL_VertexP4ui(disp, parameters) \
     (* GET_VertexP4ui(disp)) parameters
-static INLINE _glptr_VertexP4ui GET_VertexP4ui(struct _glapi_table *disp) {
+static inline _glptr_VertexP4ui GET_VertexP4ui(struct _glapi_table *disp) {
    return (_glptr_VertexP4ui) (GET_by_offset(disp, _gloffset_VertexP4ui));
 }
 
-static INLINE void SET_VertexP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_VertexP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexP4ui, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexP4uiv)(GLenum, const GLuint *);
 #define CALL_VertexP4uiv(disp, parameters) \
     (* GET_VertexP4uiv(disp)) parameters
-static INLINE _glptr_VertexP4uiv GET_VertexP4uiv(struct _glapi_table *disp) {
+static inline _glptr_VertexP4uiv GET_VertexP4uiv(struct _glapi_table *disp) {
    return (_glptr_VertexP4uiv) (GET_by_offset(disp, _gloffset_VertexP4uiv));
 }
 
-static INLINE void SET_VertexP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
+static inline void SET_VertexP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexP4uiv, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindTransformFeedback)(GLenum, GLuint);
 #define CALL_BindTransformFeedback(disp, parameters) \
     (* GET_BindTransformFeedback(disp)) parameters
-static INLINE _glptr_BindTransformFeedback GET_BindTransformFeedback(struct _glapi_table *disp) {
+static inline _glptr_BindTransformFeedback GET_BindTransformFeedback(struct _glapi_table *disp) {
    return (_glptr_BindTransformFeedback) (GET_by_offset(disp, _gloffset_BindTransformFeedback));
 }
 
-static INLINE void SET_BindTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BindTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BindTransformFeedback, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteTransformFeedbacks)(GLsizei, const GLuint *);
 #define CALL_DeleteTransformFeedbacks(disp, parameters) \
     (* GET_DeleteTransformFeedbacks(disp)) parameters
-static INLINE _glptr_DeleteTransformFeedbacks GET_DeleteTransformFeedbacks(struct _glapi_table *disp) {
+static inline _glptr_DeleteTransformFeedbacks GET_DeleteTransformFeedbacks(struct _glapi_table *disp) {
    return (_glptr_DeleteTransformFeedbacks) (GET_by_offset(disp, _gloffset_DeleteTransformFeedbacks));
 }
 
-static INLINE void SET_DeleteTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteTransformFeedbacks, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DrawTransformFeedback)(GLenum, GLuint);
 #define CALL_DrawTransformFeedback(disp, parameters) \
     (* GET_DrawTransformFeedback(disp)) parameters
-static INLINE _glptr_DrawTransformFeedback GET_DrawTransformFeedback(struct _glapi_table *disp) {
+static inline _glptr_DrawTransformFeedback GET_DrawTransformFeedback(struct _glapi_table *disp) {
    return (_glptr_DrawTransformFeedback) (GET_by_offset(disp, _gloffset_DrawTransformFeedback));
 }
 
-static INLINE void SET_DrawTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_DrawTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_DrawTransformFeedback, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenTransformFeedbacks)(GLsizei, GLuint *);
 #define CALL_GenTransformFeedbacks(disp, parameters) \
     (* GET_GenTransformFeedbacks(disp)) parameters
-static INLINE _glptr_GenTransformFeedbacks GET_GenTransformFeedbacks(struct _glapi_table *disp) {
+static inline _glptr_GenTransformFeedbacks GET_GenTransformFeedbacks(struct _glapi_table *disp) {
    return (_glptr_GenTransformFeedbacks) (GET_by_offset(disp, _gloffset_GenTransformFeedbacks));
 }
 
-static INLINE void SET_GenTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenTransformFeedbacks, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsTransformFeedback)(GLuint);
 #define CALL_IsTransformFeedback(disp, parameters) \
     (* GET_IsTransformFeedback(disp)) parameters
-static INLINE _glptr_IsTransformFeedback GET_IsTransformFeedback(struct _glapi_table *disp) {
+static inline _glptr_IsTransformFeedback GET_IsTransformFeedback(struct _glapi_table *disp) {
    return (_glptr_IsTransformFeedback) (GET_by_offset(disp, _gloffset_IsTransformFeedback));
 }
 
-static INLINE void SET_IsTransformFeedback(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsTransformFeedback(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsTransformFeedback, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PauseTransformFeedback)(void);
 #define CALL_PauseTransformFeedback(disp, parameters) \
     (* GET_PauseTransformFeedback(disp)) parameters
-static INLINE _glptr_PauseTransformFeedback GET_PauseTransformFeedback(struct _glapi_table *disp) {
+static inline _glptr_PauseTransformFeedback GET_PauseTransformFeedback(struct _glapi_table *disp) {
    return (_glptr_PauseTransformFeedback) (GET_by_offset(disp, _gloffset_PauseTransformFeedback));
 }
 
-static INLINE void SET_PauseTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PauseTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PauseTransformFeedback, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ResumeTransformFeedback)(void);
 #define CALL_ResumeTransformFeedback(disp, parameters) \
     (* GET_ResumeTransformFeedback(disp)) parameters
-static INLINE _glptr_ResumeTransformFeedback GET_ResumeTransformFeedback(struct _glapi_table *disp) {
+static inline _glptr_ResumeTransformFeedback GET_ResumeTransformFeedback(struct _glapi_table *disp) {
    return (_glptr_ResumeTransformFeedback) (GET_by_offset(disp, _gloffset_ResumeTransformFeedback));
 }
 
-static INLINE void SET_ResumeTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_ResumeTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_ResumeTransformFeedback, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearDepthf)(GLclampf);
 #define CALL_ClearDepthf(disp, parameters) \
     (* GET_ClearDepthf(disp)) parameters
-static INLINE _glptr_ClearDepthf GET_ClearDepthf(struct _glapi_table *disp) {
+static inline _glptr_ClearDepthf GET_ClearDepthf(struct _glapi_table *disp) {
    return (_glptr_ClearDepthf) (GET_by_offset(disp, _gloffset_ClearDepthf));
 }
 
-static INLINE void SET_ClearDepthf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf)) {
+static inline void SET_ClearDepthf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf)) {
    SET_by_offset(disp, _gloffset_ClearDepthf, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DepthRangef)(GLclampf, GLclampf);
 #define CALL_DepthRangef(disp, parameters) \
     (* GET_DepthRangef(disp)) parameters
-static INLINE _glptr_DepthRangef GET_DepthRangef(struct _glapi_table *disp) {
+static inline _glptr_DepthRangef GET_DepthRangef(struct _glapi_table *disp) {
    return (_glptr_DepthRangef) (GET_by_offset(disp, _gloffset_DepthRangef));
 }
 
-static INLINE void SET_DepthRangef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf)) {
+static inline void SET_DepthRangef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf)) {
    SET_by_offset(disp, _gloffset_DepthRangef, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetShaderPrecisionFormat)(GLenum, GLenum, GLint *, GLint *);
 #define CALL_GetShaderPrecisionFormat(disp, parameters) \
     (* GET_GetShaderPrecisionFormat(disp)) parameters
-static INLINE _glptr_GetShaderPrecisionFormat GET_GetShaderPrecisionFormat(struct _glapi_table *disp) {
+static inline _glptr_GetShaderPrecisionFormat GET_GetShaderPrecisionFormat(struct _glapi_table *disp) {
    return (_glptr_GetShaderPrecisionFormat) (GET_by_offset(disp, _gloffset_GetShaderPrecisionFormat));
 }
 
-static INLINE void SET_GetShaderPrecisionFormat(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *, GLint *)) {
+static inline void SET_GetShaderPrecisionFormat(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *, GLint *)) {
    SET_by_offset(disp, _gloffset_GetShaderPrecisionFormat, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ReleaseShaderCompiler)(void);
 #define CALL_ReleaseShaderCompiler(disp, parameters) \
     (* GET_ReleaseShaderCompiler(disp)) parameters
-static INLINE _glptr_ReleaseShaderCompiler GET_ReleaseShaderCompiler(struct _glapi_table *disp) {
+static inline _glptr_ReleaseShaderCompiler GET_ReleaseShaderCompiler(struct _glapi_table *disp) {
    return (_glptr_ReleaseShaderCompiler) (GET_by_offset(disp, _gloffset_ReleaseShaderCompiler));
 }
 
-static INLINE void SET_ReleaseShaderCompiler(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_ReleaseShaderCompiler(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_ReleaseShaderCompiler, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ShaderBinary)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei);
 #define CALL_ShaderBinary(disp, parameters) \
     (* GET_ShaderBinary(disp)) parameters
-static INLINE _glptr_ShaderBinary GET_ShaderBinary(struct _glapi_table *disp) {
+static inline _glptr_ShaderBinary GET_ShaderBinary(struct _glapi_table *disp) {
    return (_glptr_ShaderBinary) (GET_by_offset(disp, _gloffset_ShaderBinary));
 }
 
-static INLINE void SET_ShaderBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei)) {
+static inline void SET_ShaderBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei)) {
    SET_by_offset(disp, _gloffset_ShaderBinary, fn);
 }
 
 typedef GLenum (GLAPIENTRYP _glptr_GetGraphicsResetStatusARB)(void);
 #define CALL_GetGraphicsResetStatusARB(disp, parameters) \
     (* GET_GetGraphicsResetStatusARB(disp)) parameters
-static INLINE _glptr_GetGraphicsResetStatusARB GET_GetGraphicsResetStatusARB(struct _glapi_table *disp) {
+static inline _glptr_GetGraphicsResetStatusARB GET_GetGraphicsResetStatusARB(struct _glapi_table *disp) {
    return (_glptr_GetGraphicsResetStatusARB) (GET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB));
 }
 
-static INLINE void SET_GetGraphicsResetStatusARB(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(void)) {
+static inline void SET_GetGraphicsResetStatusARB(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnColorTableARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnColorTableARB(disp, parameters) \
     (* GET_GetnColorTableARB(disp)) parameters
-static INLINE _glptr_GetnColorTableARB GET_GetnColorTableARB(struct _glapi_table *disp) {
+static inline _glptr_GetnColorTableARB GET_GetnColorTableARB(struct _glapi_table *disp) {
    return (_glptr_GetnColorTableARB) (GET_by_offset(disp, _gloffset_GetnColorTableARB));
 }
 
-static INLINE void SET_GetnColorTableARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *)) {
+static inline void SET_GetnColorTableARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnColorTableARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnCompressedTexImageARB)(GLenum, GLint, GLsizei, GLvoid *);
 #define CALL_GetnCompressedTexImageARB(disp, parameters) \
     (* GET_GetnCompressedTexImageARB(disp)) parameters
-static INLINE _glptr_GetnCompressedTexImageARB GET_GetnCompressedTexImageARB(struct _glapi_table *disp) {
+static inline _glptr_GetnCompressedTexImageARB GET_GetnCompressedTexImageARB(struct _glapi_table *disp) {
    return (_glptr_GetnCompressedTexImageARB) (GET_by_offset(disp, _gloffset_GetnCompressedTexImageARB));
 }
 
-static INLINE void SET_GetnCompressedTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLvoid *)) {
+static inline void SET_GetnCompressedTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnCompressedTexImageARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnConvolutionFilterARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnConvolutionFilterARB(disp, parameters) \
     (* GET_GetnConvolutionFilterARB(disp)) parameters
-static INLINE _glptr_GetnConvolutionFilterARB GET_GetnConvolutionFilterARB(struct _glapi_table *disp) {
+static inline _glptr_GetnConvolutionFilterARB GET_GetnConvolutionFilterARB(struct _glapi_table *disp) {
    return (_glptr_GetnConvolutionFilterARB) (GET_by_offset(disp, _gloffset_GetnConvolutionFilterARB));
 }
 
-static INLINE void SET_GetnConvolutionFilterARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *)) {
+static inline void SET_GetnConvolutionFilterARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnConvolutionFilterARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnHistogramARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnHistogramARB(disp, parameters) \
     (* GET_GetnHistogramARB(disp)) parameters
-static INLINE _glptr_GetnHistogramARB GET_GetnHistogramARB(struct _glapi_table *disp) {
+static inline _glptr_GetnHistogramARB GET_GetnHistogramARB(struct _glapi_table *disp) {
    return (_glptr_GetnHistogramARB) (GET_by_offset(disp, _gloffset_GetnHistogramARB));
 }
 
-static INLINE void SET_GetnHistogramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *)) {
+static inline void SET_GetnHistogramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnHistogramARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnMapdvARB)(GLenum, GLenum, GLsizei, GLdouble *);
 #define CALL_GetnMapdvARB(disp, parameters) \
     (* GET_GetnMapdvARB(disp)) parameters
-static INLINE _glptr_GetnMapdvARB GET_GetnMapdvARB(struct _glapi_table *disp) {
+static inline _glptr_GetnMapdvARB GET_GetnMapdvARB(struct _glapi_table *disp) {
    return (_glptr_GetnMapdvARB) (GET_by_offset(disp, _gloffset_GetnMapdvARB));
 }
 
-static INLINE void SET_GetnMapdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLdouble *)) {
+static inline void SET_GetnMapdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetnMapdvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnMapfvARB)(GLenum, GLenum, GLsizei, GLfloat *);
 #define CALL_GetnMapfvARB(disp, parameters) \
     (* GET_GetnMapfvARB(disp)) parameters
-static INLINE _glptr_GetnMapfvARB GET_GetnMapfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetnMapfvARB GET_GetnMapfvARB(struct _glapi_table *disp) {
    return (_glptr_GetnMapfvARB) (GET_by_offset(disp, _gloffset_GetnMapfvARB));
 }
 
-static INLINE void SET_GetnMapfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLfloat *)) {
+static inline void SET_GetnMapfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetnMapfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnMapivARB)(GLenum, GLenum, GLsizei, GLint *);
 #define CALL_GetnMapivARB(disp, parameters) \
     (* GET_GetnMapivARB(disp)) parameters
-static INLINE _glptr_GetnMapivARB GET_GetnMapivARB(struct _glapi_table *disp) {
+static inline _glptr_GetnMapivARB GET_GetnMapivARB(struct _glapi_table *disp) {
    return (_glptr_GetnMapivARB) (GET_by_offset(disp, _gloffset_GetnMapivARB));
 }
 
-static INLINE void SET_GetnMapivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLint *)) {
+static inline void SET_GetnMapivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLint *)) {
    SET_by_offset(disp, _gloffset_GetnMapivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnMinmaxARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnMinmaxARB(disp, parameters) \
     (* GET_GetnMinmaxARB(disp)) parameters
-static INLINE _glptr_GetnMinmaxARB GET_GetnMinmaxARB(struct _glapi_table *disp) {
+static inline _glptr_GetnMinmaxARB GET_GetnMinmaxARB(struct _glapi_table *disp) {
    return (_glptr_GetnMinmaxARB) (GET_by_offset(disp, _gloffset_GetnMinmaxARB));
 }
 
-static INLINE void SET_GetnMinmaxARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *)) {
+static inline void SET_GetnMinmaxARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnMinmaxARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnPixelMapfvARB)(GLenum, GLsizei, GLfloat *);
 #define CALL_GetnPixelMapfvARB(disp, parameters) \
     (* GET_GetnPixelMapfvARB(disp)) parameters
-static INLINE _glptr_GetnPixelMapfvARB GET_GetnPixelMapfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetnPixelMapfvARB GET_GetnPixelMapfvARB(struct _glapi_table *disp) {
    return (_glptr_GetnPixelMapfvARB) (GET_by_offset(disp, _gloffset_GetnPixelMapfvARB));
 }
 
-static INLINE void SET_GetnPixelMapfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLfloat *)) {
+static inline void SET_GetnPixelMapfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetnPixelMapfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnPixelMapuivARB)(GLenum, GLsizei, GLuint *);
 #define CALL_GetnPixelMapuivARB(disp, parameters) \
     (* GET_GetnPixelMapuivARB(disp)) parameters
-static INLINE _glptr_GetnPixelMapuivARB GET_GetnPixelMapuivARB(struct _glapi_table *disp) {
+static inline _glptr_GetnPixelMapuivARB GET_GetnPixelMapuivARB(struct _glapi_table *disp) {
    return (_glptr_GetnPixelMapuivARB) (GET_by_offset(disp, _gloffset_GetnPixelMapuivARB));
 }
 
-static INLINE void SET_GetnPixelMapuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLuint *)) {
+static inline void SET_GetnPixelMapuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetnPixelMapuivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnPixelMapusvARB)(GLenum, GLsizei, GLushort *);
 #define CALL_GetnPixelMapusvARB(disp, parameters) \
     (* GET_GetnPixelMapusvARB(disp)) parameters
-static INLINE _glptr_GetnPixelMapusvARB GET_GetnPixelMapusvARB(struct _glapi_table *disp) {
+static inline _glptr_GetnPixelMapusvARB GET_GetnPixelMapusvARB(struct _glapi_table *disp) {
    return (_glptr_GetnPixelMapusvARB) (GET_by_offset(disp, _gloffset_GetnPixelMapusvARB));
 }
 
-static INLINE void SET_GetnPixelMapusvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLushort *)) {
+static inline void SET_GetnPixelMapusvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLushort *)) {
    SET_by_offset(disp, _gloffset_GetnPixelMapusvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnPolygonStippleARB)(GLsizei, GLubyte *);
 #define CALL_GetnPolygonStippleARB(disp, parameters) \
     (* GET_GetnPolygonStippleARB(disp)) parameters
-static INLINE _glptr_GetnPolygonStippleARB GET_GetnPolygonStippleARB(struct _glapi_table *disp) {
+static inline _glptr_GetnPolygonStippleARB GET_GetnPolygonStippleARB(struct _glapi_table *disp) {
    return (_glptr_GetnPolygonStippleARB) (GET_by_offset(disp, _gloffset_GetnPolygonStippleARB));
 }
 
-static INLINE void SET_GetnPolygonStippleARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLubyte *)) {
+static inline void SET_GetnPolygonStippleARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLubyte *)) {
    SET_by_offset(disp, _gloffset_GetnPolygonStippleARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnSeparableFilterARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *, GLsizei, GLvoid *, GLvoid *);
 #define CALL_GetnSeparableFilterARB(disp, parameters) \
     (* GET_GetnSeparableFilterARB(disp)) parameters
-static INLINE _glptr_GetnSeparableFilterARB GET_GetnSeparableFilterARB(struct _glapi_table *disp) {
+static inline _glptr_GetnSeparableFilterARB GET_GetnSeparableFilterARB(struct _glapi_table *disp) {
    return (_glptr_GetnSeparableFilterARB) (GET_by_offset(disp, _gloffset_GetnSeparableFilterARB));
 }
 
-static INLINE void SET_GetnSeparableFilterARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *, GLsizei, GLvoid *, GLvoid *)) {
+static inline void SET_GetnSeparableFilterARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *, GLsizei, GLvoid *, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnSeparableFilterARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnTexImageARB)(GLenum, GLint, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnTexImageARB(disp, parameters) \
     (* GET_GetnTexImageARB(disp)) parameters
-static INLINE _glptr_GetnTexImageARB GET_GetnTexImageARB(struct _glapi_table *disp) {
+static inline _glptr_GetnTexImageARB GET_GetnTexImageARB(struct _glapi_table *disp) {
    return (_glptr_GetnTexImageARB) (GET_by_offset(disp, _gloffset_GetnTexImageARB));
 }
 
-static INLINE void SET_GetnTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLenum, GLsizei, GLvoid *)) {
+static inline void SET_GetnTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_GetnTexImageARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnUniformdvARB)(GLhandleARB, GLint, GLsizei, GLdouble *);
 #define CALL_GetnUniformdvARB(disp, parameters) \
     (* GET_GetnUniformdvARB(disp)) parameters
-static INLINE _glptr_GetnUniformdvARB GET_GetnUniformdvARB(struct _glapi_table *disp) {
+static inline _glptr_GetnUniformdvARB GET_GetnUniformdvARB(struct _glapi_table *disp) {
    return (_glptr_GetnUniformdvARB) (GET_by_offset(disp, _gloffset_GetnUniformdvARB));
 }
 
-static INLINE void SET_GetnUniformdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLdouble *)) {
+static inline void SET_GetnUniformdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetnUniformdvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnUniformfvARB)(GLhandleARB, GLint, GLsizei, GLfloat *);
 #define CALL_GetnUniformfvARB(disp, parameters) \
     (* GET_GetnUniformfvARB(disp)) parameters
-static INLINE _glptr_GetnUniformfvARB GET_GetnUniformfvARB(struct _glapi_table *disp) {
+static inline _glptr_GetnUniformfvARB GET_GetnUniformfvARB(struct _glapi_table *disp) {
    return (_glptr_GetnUniformfvARB) (GET_by_offset(disp, _gloffset_GetnUniformfvARB));
 }
 
-static INLINE void SET_GetnUniformfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLfloat *)) {
+static inline void SET_GetnUniformfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetnUniformfvARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnUniformivARB)(GLhandleARB, GLint, GLsizei, GLint *);
 #define CALL_GetnUniformivARB(disp, parameters) \
     (* GET_GetnUniformivARB(disp)) parameters
-static INLINE _glptr_GetnUniformivARB GET_GetnUniformivARB(struct _glapi_table *disp) {
+static inline _glptr_GetnUniformivARB GET_GetnUniformivARB(struct _glapi_table *disp) {
    return (_glptr_GetnUniformivARB) (GET_by_offset(disp, _gloffset_GetnUniformivARB));
 }
 
-static INLINE void SET_GetnUniformivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLint *)) {
+static inline void SET_GetnUniformivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLint *)) {
    SET_by_offset(disp, _gloffset_GetnUniformivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetnUniformuivARB)(GLhandleARB, GLint, GLsizei, GLuint *);
 #define CALL_GetnUniformuivARB(disp, parameters) \
     (* GET_GetnUniformuivARB(disp)) parameters
-static INLINE _glptr_GetnUniformuivARB GET_GetnUniformuivARB(struct _glapi_table *disp) {
+static inline _glptr_GetnUniformuivARB GET_GetnUniformuivARB(struct _glapi_table *disp) {
    return (_glptr_GetnUniformuivARB) (GET_by_offset(disp, _gloffset_GetnUniformuivARB));
 }
 
-static INLINE void SET_GetnUniformuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLuint *)) {
+static inline void SET_GetnUniformuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLint, GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetnUniformuivARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ReadnPixelsARB)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_ReadnPixelsARB(disp, parameters) \
     (* GET_ReadnPixelsARB(disp)) parameters
-static INLINE _glptr_ReadnPixelsARB GET_ReadnPixelsARB(struct _glapi_table *disp) {
+static inline _glptr_ReadnPixelsARB GET_ReadnPixelsARB(struct _glapi_table *disp) {
    return (_glptr_ReadnPixelsARB) (GET_by_offset(disp, _gloffset_ReadnPixelsARB));
 }
 
-static INLINE void SET_ReadnPixelsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *)) {
+static inline void SET_ReadnPixelsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_ReadnPixelsARB, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexStorage1D)(GLenum, GLsizei, GLenum, GLsizei);
 #define CALL_TexStorage1D(disp, parameters) \
     (* GET_TexStorage1D(disp)) parameters
-static INLINE _glptr_TexStorage1D GET_TexStorage1D(struct _glapi_table *disp) {
+static inline _glptr_TexStorage1D GET_TexStorage1D(struct _glapi_table *disp) {
    return (_glptr_TexStorage1D) (GET_by_offset(disp, _gloffset_TexStorage1D));
 }
 
-static INLINE void SET_TexStorage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei)) {
+static inline void SET_TexStorage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei)) {
    SET_by_offset(disp, _gloffset_TexStorage1D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexStorage2D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
 #define CALL_TexStorage2D(disp, parameters) \
     (* GET_TexStorage2D(disp)) parameters
-static INLINE _glptr_TexStorage2D GET_TexStorage2D(struct _glapi_table *disp) {
+static inline _glptr_TexStorage2D GET_TexStorage2D(struct _glapi_table *disp) {
    return (_glptr_TexStorage2D) (GET_by_offset(disp, _gloffset_TexStorage2D));
 }
 
-static INLINE void SET_TexStorage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
+static inline void SET_TexStorage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_TexStorage2D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
 #define CALL_TexStorage3D(disp, parameters) \
     (* GET_TexStorage3D(disp)) parameters
-static INLINE _glptr_TexStorage3D GET_TexStorage3D(struct _glapi_table *disp) {
+static inline _glptr_TexStorage3D GET_TexStorage3D(struct _glapi_table *disp) {
    return (_glptr_TexStorage3D) (GET_by_offset(disp, _gloffset_TexStorage3D));
 }
 
-static INLINE void SET_TexStorage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
+static inline void SET_TexStorage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_TexStorage3D, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TextureStorage1DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei);
 #define CALL_TextureStorage1DEXT(disp, parameters) \
     (* GET_TextureStorage1DEXT(disp)) parameters
-static INLINE _glptr_TextureStorage1DEXT GET_TextureStorage1DEXT(struct _glapi_table *disp) {
+static inline _glptr_TextureStorage1DEXT GET_TextureStorage1DEXT(struct _glapi_table *disp) {
    return (_glptr_TextureStorage1DEXT) (GET_by_offset(disp, _gloffset_TextureStorage1DEXT));
 }
 
-static INLINE void SET_TextureStorage1DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei)) {
+static inline void SET_TextureStorage1DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei)) {
    SET_by_offset(disp, _gloffset_TextureStorage1DEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TextureStorage2DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei);
 #define CALL_TextureStorage2DEXT(disp, parameters) \
     (* GET_TextureStorage2DEXT(disp)) parameters
-static INLINE _glptr_TextureStorage2DEXT GET_TextureStorage2DEXT(struct _glapi_table *disp) {
+static inline _glptr_TextureStorage2DEXT GET_TextureStorage2DEXT(struct _glapi_table *disp) {
    return (_glptr_TextureStorage2DEXT) (GET_by_offset(disp, _gloffset_TextureStorage2DEXT));
 }
 
-static INLINE void SET_TextureStorage2DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
+static inline void SET_TextureStorage2DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_TextureStorage2DEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TextureStorage3DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
 #define CALL_TextureStorage3DEXT(disp, parameters) \
     (* GET_TextureStorage3DEXT(disp)) parameters
-static INLINE _glptr_TextureStorage3DEXT GET_TextureStorage3DEXT(struct _glapi_table *disp) {
+static inline _glptr_TextureStorage3DEXT GET_TextureStorage3DEXT(struct _glapi_table *disp) {
    return (_glptr_TextureStorage3DEXT) (GET_by_offset(disp, _gloffset_TextureStorage3DEXT));
 }
 
-static INLINE void SET_TextureStorage3DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
+static inline void SET_TextureStorage3DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_TextureStorage3DEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PolygonOffsetEXT)(GLfloat, GLfloat);
 #define CALL_PolygonOffsetEXT(disp, parameters) \
     (* GET_PolygonOffsetEXT(disp)) parameters
-static INLINE _glptr_PolygonOffsetEXT GET_PolygonOffsetEXT(struct _glapi_table *disp) {
+static inline _glptr_PolygonOffsetEXT GET_PolygonOffsetEXT(struct _glapi_table *disp) {
    return (_glptr_PolygonOffsetEXT) (GET_by_offset(disp, _gloffset_PolygonOffsetEXT));
 }
 
-static INLINE void SET_PolygonOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_PolygonOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_PolygonOffsetEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPixelTexGenParameterfvSGIS)(GLenum, GLfloat *);
 #define CALL_GetPixelTexGenParameterfvSGIS(disp, parameters) \
     (* GET_GetPixelTexGenParameterfvSGIS(disp)) parameters
-static INLINE _glptr_GetPixelTexGenParameterfvSGIS GET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp) {
+static inline _glptr_GetPixelTexGenParameterfvSGIS GET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp) {
    return (_glptr_GetPixelTexGenParameterfvSGIS) (GET_by_offset(disp, _gloffset_GetPixelTexGenParameterfvSGIS));
 }
 
-static INLINE void SET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
+static inline void SET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetPixelTexGenParameterfvSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetPixelTexGenParameterivSGIS)(GLenum, GLint *);
 #define CALL_GetPixelTexGenParameterivSGIS(disp, parameters) \
     (* GET_GetPixelTexGenParameterivSGIS(disp)) parameters
-static INLINE _glptr_GetPixelTexGenParameterivSGIS GET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp) {
+static inline _glptr_GetPixelTexGenParameterivSGIS GET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp) {
    return (_glptr_GetPixelTexGenParameterivSGIS) (GET_by_offset(disp, _gloffset_GetPixelTexGenParameterivSGIS));
 }
 
-static INLINE void SET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) {
+static inline void SET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetPixelTexGenParameterivSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterfSGIS)(GLenum, GLfloat);
 #define CALL_PixelTexGenParameterfSGIS(disp, parameters) \
     (* GET_PixelTexGenParameterfSGIS(disp)) parameters
-static INLINE _glptr_PixelTexGenParameterfSGIS GET_PixelTexGenParameterfSGIS(struct _glapi_table *disp) {
+static inline _glptr_PixelTexGenParameterfSGIS GET_PixelTexGenParameterfSGIS(struct _glapi_table *disp) {
    return (_glptr_PixelTexGenParameterfSGIS) (GET_by_offset(disp, _gloffset_PixelTexGenParameterfSGIS));
 }
 
-static INLINE void SET_PixelTexGenParameterfSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_PixelTexGenParameterfSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_PixelTexGenParameterfSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterfvSGIS)(GLenum, const GLfloat *);
 #define CALL_PixelTexGenParameterfvSGIS(disp, parameters) \
     (* GET_PixelTexGenParameterfvSGIS(disp)) parameters
-static INLINE _glptr_PixelTexGenParameterfvSGIS GET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp) {
+static inline _glptr_PixelTexGenParameterfvSGIS GET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp) {
    return (_glptr_PixelTexGenParameterfvSGIS) (GET_by_offset(disp, _gloffset_PixelTexGenParameterfvSGIS));
 }
 
-static INLINE void SET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_PixelTexGenParameterfvSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTexGenParameteriSGIS)(GLenum, GLint);
 #define CALL_PixelTexGenParameteriSGIS(disp, parameters) \
     (* GET_PixelTexGenParameteriSGIS(disp)) parameters
-static INLINE _glptr_PixelTexGenParameteriSGIS GET_PixelTexGenParameteriSGIS(struct _glapi_table *disp) {
+static inline _glptr_PixelTexGenParameteriSGIS GET_PixelTexGenParameteriSGIS(struct _glapi_table *disp) {
    return (_glptr_PixelTexGenParameteriSGIS) (GET_by_offset(disp, _gloffset_PixelTexGenParameteriSGIS));
 }
 
-static INLINE void SET_PixelTexGenParameteriSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_PixelTexGenParameteriSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_PixelTexGenParameteriSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterivSGIS)(GLenum, const GLint *);
 #define CALL_PixelTexGenParameterivSGIS(disp, parameters) \
     (* GET_PixelTexGenParameterivSGIS(disp)) parameters
-static INLINE _glptr_PixelTexGenParameterivSGIS GET_PixelTexGenParameterivSGIS(struct _glapi_table *disp) {
+static inline _glptr_PixelTexGenParameterivSGIS GET_PixelTexGenParameterivSGIS(struct _glapi_table *disp) {
    return (_glptr_PixelTexGenParameterivSGIS) (GET_by_offset(disp, _gloffset_PixelTexGenParameterivSGIS));
 }
 
-static INLINE void SET_PixelTexGenParameterivSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_PixelTexGenParameterivSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_PixelTexGenParameterivSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SampleMaskSGIS)(GLclampf, GLboolean);
 #define CALL_SampleMaskSGIS(disp, parameters) \
     (* GET_SampleMaskSGIS(disp)) parameters
-static INLINE _glptr_SampleMaskSGIS GET_SampleMaskSGIS(struct _glapi_table *disp) {
+static inline _glptr_SampleMaskSGIS GET_SampleMaskSGIS(struct _glapi_table *disp) {
    return (_glptr_SampleMaskSGIS) (GET_by_offset(disp, _gloffset_SampleMaskSGIS));
 }
 
-static INLINE void SET_SampleMaskSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) {
+static inline void SET_SampleMaskSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) {
    SET_by_offset(disp, _gloffset_SampleMaskSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SamplePatternSGIS)(GLenum);
 #define CALL_SamplePatternSGIS(disp, parameters) \
     (* GET_SamplePatternSGIS(disp)) parameters
-static INLINE _glptr_SamplePatternSGIS GET_SamplePatternSGIS(struct _glapi_table *disp) {
+static inline _glptr_SamplePatternSGIS GET_SamplePatternSGIS(struct _glapi_table *disp) {
    return (_glptr_SamplePatternSGIS) (GET_by_offset(disp, _gloffset_SamplePatternSGIS));
 }
 
-static INLINE void SET_SamplePatternSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_SamplePatternSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_SamplePatternSGIS, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
 #define CALL_ColorPointerEXT(disp, parameters) \
     (* GET_ColorPointerEXT(disp)) parameters
-static INLINE _glptr_ColorPointerEXT GET_ColorPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_ColorPointerEXT GET_ColorPointerEXT(struct _glapi_table *disp) {
    return (_glptr_ColorPointerEXT) (GET_by_offset(disp, _gloffset_ColorPointerEXT));
 }
 
-static INLINE void SET_ColorPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) {
+static inline void SET_ColorPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_ColorPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EdgeFlagPointerEXT)(GLsizei, GLsizei, const GLboolean *);
 #define CALL_EdgeFlagPointerEXT(disp, parameters) \
     (* GET_EdgeFlagPointerEXT(disp)) parameters
-static INLINE _glptr_EdgeFlagPointerEXT GET_EdgeFlagPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_EdgeFlagPointerEXT GET_EdgeFlagPointerEXT(struct _glapi_table *disp) {
    return (_glptr_EdgeFlagPointerEXT) (GET_by_offset(disp, _gloffset_EdgeFlagPointerEXT));
 }
 
-static INLINE void SET_EdgeFlagPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, const GLboolean *)) {
+static inline void SET_EdgeFlagPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, const GLboolean *)) {
    SET_by_offset(disp, _gloffset_EdgeFlagPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_IndexPointerEXT)(GLenum, GLsizei, GLsizei, const GLvoid *);
 #define CALL_IndexPointerEXT(disp, parameters) \
     (* GET_IndexPointerEXT(disp)) parameters
-static INLINE _glptr_IndexPointerEXT GET_IndexPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_IndexPointerEXT GET_IndexPointerEXT(struct _glapi_table *disp) {
    return (_glptr_IndexPointerEXT) (GET_by_offset(disp, _gloffset_IndexPointerEXT));
 }
 
-static INLINE void SET_IndexPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, const GLvoid *)) {
+static inline void SET_IndexPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_IndexPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_NormalPointerEXT)(GLenum, GLsizei, GLsizei, const GLvoid *);
 #define CALL_NormalPointerEXT(disp, parameters) \
     (* GET_NormalPointerEXT(disp)) parameters
-static INLINE _glptr_NormalPointerEXT GET_NormalPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_NormalPointerEXT GET_NormalPointerEXT(struct _glapi_table *disp) {
    return (_glptr_NormalPointerEXT) (GET_by_offset(disp, _gloffset_NormalPointerEXT));
 }
 
-static INLINE void SET_NormalPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, const GLvoid *)) {
+static inline void SET_NormalPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_NormalPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexCoordPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
 #define CALL_TexCoordPointerEXT(disp, parameters) \
     (* GET_TexCoordPointerEXT(disp)) parameters
-static INLINE _glptr_TexCoordPointerEXT GET_TexCoordPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_TexCoordPointerEXT GET_TexCoordPointerEXT(struct _glapi_table *disp) {
    return (_glptr_TexCoordPointerEXT) (GET_by_offset(disp, _gloffset_TexCoordPointerEXT));
 }
 
-static INLINE void SET_TexCoordPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) {
+static inline void SET_TexCoordPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_TexCoordPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
 #define CALL_VertexPointerEXT(disp, parameters) \
     (* GET_VertexPointerEXT(disp)) parameters
-static INLINE _glptr_VertexPointerEXT GET_VertexPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexPointerEXT GET_VertexPointerEXT(struct _glapi_table *disp) {
    return (_glptr_VertexPointerEXT) (GET_by_offset(disp, _gloffset_VertexPointerEXT));
 }
 
-static INLINE void SET_VertexPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) {
+static inline void SET_VertexPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_VertexPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PointParameterfEXT)(GLenum, GLfloat);
 #define CALL_PointParameterfEXT(disp, parameters) \
     (* GET_PointParameterfEXT(disp)) parameters
-static INLINE _glptr_PointParameterfEXT GET_PointParameterfEXT(struct _glapi_table *disp) {
+static inline _glptr_PointParameterfEXT GET_PointParameterfEXT(struct _glapi_table *disp) {
    return (_glptr_PointParameterfEXT) (GET_by_offset(disp, _gloffset_PointParameterfEXT));
 }
 
-static INLINE void SET_PointParameterfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_PointParameterfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_PointParameterfEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PointParameterfvEXT)(GLenum, const GLfloat *);
 #define CALL_PointParameterfvEXT(disp, parameters) \
     (* GET_PointParameterfvEXT(disp)) parameters
-static INLINE _glptr_PointParameterfvEXT GET_PointParameterfvEXT(struct _glapi_table *disp) {
+static inline _glptr_PointParameterfvEXT GET_PointParameterfvEXT(struct _glapi_table *disp) {
    return (_glptr_PointParameterfvEXT) (GET_by_offset(disp, _gloffset_PointParameterfvEXT));
 }
 
-static INLINE void SET_PointParameterfvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_PointParameterfvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_PointParameterfvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LockArraysEXT)(GLint, GLsizei);
 #define CALL_LockArraysEXT(disp, parameters) \
     (* GET_LockArraysEXT(disp)) parameters
-static INLINE _glptr_LockArraysEXT GET_LockArraysEXT(struct _glapi_table *disp) {
+static inline _glptr_LockArraysEXT GET_LockArraysEXT(struct _glapi_table *disp) {
    return (_glptr_LockArraysEXT) (GET_by_offset(disp, _gloffset_LockArraysEXT));
 }
 
-static INLINE void SET_LockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei)) {
+static inline void SET_LockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei)) {
    SET_by_offset(disp, _gloffset_LockArraysEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UnlockArraysEXT)(void);
 #define CALL_UnlockArraysEXT(disp, parameters) \
     (* GET_UnlockArraysEXT(disp)) parameters
-static INLINE _glptr_UnlockArraysEXT GET_UnlockArraysEXT(struct _glapi_table *disp) {
+static inline _glptr_UnlockArraysEXT GET_UnlockArraysEXT(struct _glapi_table *disp) {
    return (_glptr_UnlockArraysEXT) (GET_by_offset(disp, _gloffset_UnlockArraysEXT));
 }
 
-static INLINE void SET_UnlockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_UnlockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_UnlockArraysEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3bEXT)(GLbyte, GLbyte, GLbyte);
 #define CALL_SecondaryColor3bEXT(disp, parameters) \
     (* GET_SecondaryColor3bEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3bEXT GET_SecondaryColor3bEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3bEXT GET_SecondaryColor3bEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3bEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3bEXT));
 }
 
-static INLINE void SET_SecondaryColor3bEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
+static inline void SET_SecondaryColor3bEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3bEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3bvEXT)(const GLbyte *);
 #define CALL_SecondaryColor3bvEXT(disp, parameters) \
     (* GET_SecondaryColor3bvEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3bvEXT GET_SecondaryColor3bvEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3bvEXT GET_SecondaryColor3bvEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3bvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3bvEXT));
 }
 
-static INLINE void SET_SecondaryColor3bvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
+static inline void SET_SecondaryColor3bvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3bvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3dEXT)(GLdouble, GLdouble, GLdouble);
 #define CALL_SecondaryColor3dEXT(disp, parameters) \
     (* GET_SecondaryColor3dEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3dEXT GET_SecondaryColor3dEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3dEXT GET_SecondaryColor3dEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3dEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3dEXT));
 }
 
-static INLINE void SET_SecondaryColor3dEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_SecondaryColor3dEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3dEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3dvEXT)(const GLdouble *);
 #define CALL_SecondaryColor3dvEXT(disp, parameters) \
     (* GET_SecondaryColor3dvEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3dvEXT GET_SecondaryColor3dvEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3dvEXT GET_SecondaryColor3dvEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3dvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3dvEXT));
 }
 
-static INLINE void SET_SecondaryColor3dvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_SecondaryColor3dvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3dvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3fEXT)(GLfloat, GLfloat, GLfloat);
 #define CALL_SecondaryColor3fEXT(disp, parameters) \
     (* GET_SecondaryColor3fEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3fEXT GET_SecondaryColor3fEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3fEXT GET_SecondaryColor3fEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3fEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3fEXT));
 }
 
-static INLINE void SET_SecondaryColor3fEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_SecondaryColor3fEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3fEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3fvEXT)(const GLfloat *);
 #define CALL_SecondaryColor3fvEXT(disp, parameters) \
     (* GET_SecondaryColor3fvEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3fvEXT GET_SecondaryColor3fvEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3fvEXT GET_SecondaryColor3fvEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3fvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3fvEXT));
 }
 
-static INLINE void SET_SecondaryColor3fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_SecondaryColor3fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3fvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3iEXT)(GLint, GLint, GLint);
 #define CALL_SecondaryColor3iEXT(disp, parameters) \
     (* GET_SecondaryColor3iEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3iEXT GET_SecondaryColor3iEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3iEXT GET_SecondaryColor3iEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3iEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3iEXT));
 }
 
-static INLINE void SET_SecondaryColor3iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_SecondaryColor3iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3iEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3ivEXT)(const GLint *);
 #define CALL_SecondaryColor3ivEXT(disp, parameters) \
     (* GET_SecondaryColor3ivEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3ivEXT GET_SecondaryColor3ivEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3ivEXT GET_SecondaryColor3ivEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3ivEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3ivEXT));
 }
 
-static INLINE void SET_SecondaryColor3ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_SecondaryColor3ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3ivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3sEXT)(GLshort, GLshort, GLshort);
 #define CALL_SecondaryColor3sEXT(disp, parameters) \
     (* GET_SecondaryColor3sEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3sEXT GET_SecondaryColor3sEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3sEXT GET_SecondaryColor3sEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3sEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3sEXT));
 }
 
-static INLINE void SET_SecondaryColor3sEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_SecondaryColor3sEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3sEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3svEXT)(const GLshort *);
 #define CALL_SecondaryColor3svEXT(disp, parameters) \
     (* GET_SecondaryColor3svEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3svEXT GET_SecondaryColor3svEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3svEXT GET_SecondaryColor3svEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3svEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3svEXT));
 }
 
-static INLINE void SET_SecondaryColor3svEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_SecondaryColor3svEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3svEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubEXT)(GLubyte, GLubyte, GLubyte);
 #define CALL_SecondaryColor3ubEXT(disp, parameters) \
     (* GET_SecondaryColor3ubEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3ubEXT GET_SecondaryColor3ubEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3ubEXT GET_SecondaryColor3ubEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3ubEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3ubEXT));
 }
 
-static INLINE void SET_SecondaryColor3ubEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) {
+static inline void SET_SecondaryColor3ubEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3ubEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubvEXT)(const GLubyte *);
 #define CALL_SecondaryColor3ubvEXT(disp, parameters) \
     (* GET_SecondaryColor3ubvEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3ubvEXT GET_SecondaryColor3ubvEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3ubvEXT GET_SecondaryColor3ubvEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3ubvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3ubvEXT));
 }
 
-static INLINE void SET_SecondaryColor3ubvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
+static inline void SET_SecondaryColor3ubvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3ubvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3uiEXT)(GLuint, GLuint, GLuint);
 #define CALL_SecondaryColor3uiEXT(disp, parameters) \
     (* GET_SecondaryColor3uiEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3uiEXT GET_SecondaryColor3uiEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3uiEXT GET_SecondaryColor3uiEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3uiEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3uiEXT));
 }
 
-static INLINE void SET_SecondaryColor3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+static inline void SET_SecondaryColor3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3uivEXT)(const GLuint *);
 #define CALL_SecondaryColor3uivEXT(disp, parameters) \
     (* GET_SecondaryColor3uivEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3uivEXT GET_SecondaryColor3uivEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3uivEXT GET_SecondaryColor3uivEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3uivEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3uivEXT));
 }
 
-static INLINE void SET_SecondaryColor3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
+static inline void SET_SecondaryColor3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3usEXT)(GLushort, GLushort, GLushort);
 #define CALL_SecondaryColor3usEXT(disp, parameters) \
     (* GET_SecondaryColor3usEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3usEXT GET_SecondaryColor3usEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3usEXT GET_SecondaryColor3usEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3usEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3usEXT));
 }
 
-static INLINE void SET_SecondaryColor3usEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) {
+static inline void SET_SecondaryColor3usEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3usEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColor3usvEXT)(const GLushort *);
 #define CALL_SecondaryColor3usvEXT(disp, parameters) \
     (* GET_SecondaryColor3usvEXT(disp)) parameters
-static INLINE _glptr_SecondaryColor3usvEXT GET_SecondaryColor3usvEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColor3usvEXT GET_SecondaryColor3usvEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColor3usvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3usvEXT));
 }
 
-static INLINE void SET_SecondaryColor3usvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
+static inline void SET_SecondaryColor3usvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
    SET_by_offset(disp, _gloffset_SecondaryColor3usvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SecondaryColorPointerEXT)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_SecondaryColorPointerEXT(disp, parameters) \
     (* GET_SecondaryColorPointerEXT(disp)) parameters
-static INLINE _glptr_SecondaryColorPointerEXT GET_SecondaryColorPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_SecondaryColorPointerEXT GET_SecondaryColorPointerEXT(struct _glapi_table *disp) {
    return (_glptr_SecondaryColorPointerEXT) (GET_by_offset(disp, _gloffset_SecondaryColorPointerEXT));
 }
 
-static INLINE void SET_SecondaryColorPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_SecondaryColorPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_SecondaryColorPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiDrawArraysEXT)(GLenum, const GLint *, const GLsizei *, GLsizei);
 #define CALL_MultiDrawArraysEXT(disp, parameters) \
     (* GET_MultiDrawArraysEXT(disp)) parameters
-static INLINE _glptr_MultiDrawArraysEXT GET_MultiDrawArraysEXT(struct _glapi_table *disp) {
+static inline _glptr_MultiDrawArraysEXT GET_MultiDrawArraysEXT(struct _glapi_table *disp) {
    return (_glptr_MultiDrawArraysEXT) (GET_by_offset(disp, _gloffset_MultiDrawArraysEXT));
 }
 
-static INLINE void SET_MultiDrawArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *, const GLsizei *, GLsizei)) {
+static inline void SET_MultiDrawArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *, const GLsizei *, GLsizei)) {
    SET_by_offset(disp, _gloffset_MultiDrawArraysEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiDrawElementsEXT)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei);
 #define CALL_MultiDrawElementsEXT(disp, parameters) \
     (* GET_MultiDrawElementsEXT(disp)) parameters
-static INLINE _glptr_MultiDrawElementsEXT GET_MultiDrawElementsEXT(struct _glapi_table *disp) {
+static inline _glptr_MultiDrawElementsEXT GET_MultiDrawElementsEXT(struct _glapi_table *disp) {
    return (_glptr_MultiDrawElementsEXT) (GET_by_offset(disp, _gloffset_MultiDrawElementsEXT));
 }
 
-static INLINE void SET_MultiDrawElementsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei)) {
+static inline void SET_MultiDrawElementsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei)) {
    SET_by_offset(disp, _gloffset_MultiDrawElementsEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FogCoordPointerEXT)(GLenum, GLsizei, const GLvoid *);
 #define CALL_FogCoordPointerEXT(disp, parameters) \
     (* GET_FogCoordPointerEXT(disp)) parameters
-static INLINE _glptr_FogCoordPointerEXT GET_FogCoordPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_FogCoordPointerEXT GET_FogCoordPointerEXT(struct _glapi_table *disp) {
    return (_glptr_FogCoordPointerEXT) (GET_by_offset(disp, _gloffset_FogCoordPointerEXT));
 }
 
-static INLINE void SET_FogCoordPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_FogCoordPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_FogCoordPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FogCoorddEXT)(GLdouble);
 #define CALL_FogCoorddEXT(disp, parameters) \
     (* GET_FogCoorddEXT(disp)) parameters
-static INLINE _glptr_FogCoorddEXT GET_FogCoorddEXT(struct _glapi_table *disp) {
+static inline _glptr_FogCoorddEXT GET_FogCoorddEXT(struct _glapi_table *disp) {
    return (_glptr_FogCoorddEXT) (GET_by_offset(disp, _gloffset_FogCoorddEXT));
 }
 
-static INLINE void SET_FogCoorddEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
+static inline void SET_FogCoorddEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
    SET_by_offset(disp, _gloffset_FogCoorddEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FogCoorddvEXT)(const GLdouble *);
 #define CALL_FogCoorddvEXT(disp, parameters) \
     (* GET_FogCoorddvEXT(disp)) parameters
-static INLINE _glptr_FogCoorddvEXT GET_FogCoorddvEXT(struct _glapi_table *disp) {
+static inline _glptr_FogCoorddvEXT GET_FogCoorddvEXT(struct _glapi_table *disp) {
    return (_glptr_FogCoorddvEXT) (GET_by_offset(disp, _gloffset_FogCoorddvEXT));
 }
 
-static INLINE void SET_FogCoorddvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_FogCoorddvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_FogCoorddvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FogCoordfEXT)(GLfloat);
 #define CALL_FogCoordfEXT(disp, parameters) \
     (* GET_FogCoordfEXT(disp)) parameters
-static INLINE _glptr_FogCoordfEXT GET_FogCoordfEXT(struct _glapi_table *disp) {
+static inline _glptr_FogCoordfEXT GET_FogCoordfEXT(struct _glapi_table *disp) {
    return (_glptr_FogCoordfEXT) (GET_by_offset(disp, _gloffset_FogCoordfEXT));
 }
 
-static INLINE void SET_FogCoordfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+static inline void SET_FogCoordfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
    SET_by_offset(disp, _gloffset_FogCoordfEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FogCoordfvEXT)(const GLfloat *);
 #define CALL_FogCoordfvEXT(disp, parameters) \
     (* GET_FogCoordfvEXT(disp)) parameters
-static INLINE _glptr_FogCoordfvEXT GET_FogCoordfvEXT(struct _glapi_table *disp) {
+static inline _glptr_FogCoordfvEXT GET_FogCoordfvEXT(struct _glapi_table *disp) {
    return (_glptr_FogCoordfvEXT) (GET_by_offset(disp, _gloffset_FogCoordfvEXT));
 }
 
-static INLINE void SET_FogCoordfvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_FogCoordfvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_FogCoordfvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PixelTexGenSGIX)(GLenum);
 #define CALL_PixelTexGenSGIX(disp, parameters) \
     (* GET_PixelTexGenSGIX(disp)) parameters
-static INLINE _glptr_PixelTexGenSGIX GET_PixelTexGenSGIX(struct _glapi_table *disp) {
+static inline _glptr_PixelTexGenSGIX GET_PixelTexGenSGIX(struct _glapi_table *disp) {
    return (_glptr_PixelTexGenSGIX) (GET_by_offset(disp, _gloffset_PixelTexGenSGIX));
 }
 
-static INLINE void SET_PixelTexGenSGIX(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_PixelTexGenSGIX(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_PixelTexGenSGIX, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateEXT)(GLenum, GLenum, GLenum, GLenum);
 #define CALL_BlendFuncSeparateEXT(disp, parameters) \
     (* GET_BlendFuncSeparateEXT(disp)) parameters
-static INLINE _glptr_BlendFuncSeparateEXT GET_BlendFuncSeparateEXT(struct _glapi_table *disp) {
+static inline _glptr_BlendFuncSeparateEXT GET_BlendFuncSeparateEXT(struct _glapi_table *disp) {
    return (_glptr_BlendFuncSeparateEXT) (GET_by_offset(disp, _gloffset_BlendFuncSeparateEXT));
 }
 
-static INLINE void SET_BlendFuncSeparateEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
+static inline void SET_BlendFuncSeparateEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendFuncSeparateEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FlushVertexArrayRangeNV)(void);
 #define CALL_FlushVertexArrayRangeNV(disp, parameters) \
     (* GET_FlushVertexArrayRangeNV(disp)) parameters
-static INLINE _glptr_FlushVertexArrayRangeNV GET_FlushVertexArrayRangeNV(struct _glapi_table *disp) {
+static inline _glptr_FlushVertexArrayRangeNV GET_FlushVertexArrayRangeNV(struct _glapi_table *disp) {
    return (_glptr_FlushVertexArrayRangeNV) (GET_by_offset(disp, _gloffset_FlushVertexArrayRangeNV));
 }
 
-static INLINE void SET_FlushVertexArrayRangeNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_FlushVertexArrayRangeNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_FlushVertexArrayRangeNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexArrayRangeNV)(GLsizei, const GLvoid *);
 #define CALL_VertexArrayRangeNV(disp, parameters) \
     (* GET_VertexArrayRangeNV(disp)) parameters
-static INLINE _glptr_VertexArrayRangeNV GET_VertexArrayRangeNV(struct _glapi_table *disp) {
+static inline _glptr_VertexArrayRangeNV GET_VertexArrayRangeNV(struct _glapi_table *disp) {
    return (_glptr_VertexArrayRangeNV) (GET_by_offset(disp, _gloffset_VertexArrayRangeNV));
 }
 
-static INLINE void SET_VertexArrayRangeNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLvoid *)) {
+static inline void SET_VertexArrayRangeNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_VertexArrayRangeNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CombinerInputNV)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
 #define CALL_CombinerInputNV(disp, parameters) \
     (* GET_CombinerInputNV(disp)) parameters
-static INLINE _glptr_CombinerInputNV GET_CombinerInputNV(struct _glapi_table *disp) {
+static inline _glptr_CombinerInputNV GET_CombinerInputNV(struct _glapi_table *disp) {
    return (_glptr_CombinerInputNV) (GET_by_offset(disp, _gloffset_CombinerInputNV));
 }
 
-static INLINE void SET_CombinerInputNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum)) {
+static inline void SET_CombinerInputNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_CombinerInputNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CombinerOutputNV)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
 #define CALL_CombinerOutputNV(disp, parameters) \
     (* GET_CombinerOutputNV(disp)) parameters
-static INLINE _glptr_CombinerOutputNV GET_CombinerOutputNV(struct _glapi_table *disp) {
+static inline _glptr_CombinerOutputNV GET_CombinerOutputNV(struct _glapi_table *disp) {
    return (_glptr_CombinerOutputNV) (GET_by_offset(disp, _gloffset_CombinerOutputNV));
 }
 
-static INLINE void SET_CombinerOutputNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean)) {
+static inline void SET_CombinerOutputNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean)) {
    SET_by_offset(disp, _gloffset_CombinerOutputNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CombinerParameterfNV)(GLenum, GLfloat);
 #define CALL_CombinerParameterfNV(disp, parameters) \
     (* GET_CombinerParameterfNV(disp)) parameters
-static INLINE _glptr_CombinerParameterfNV GET_CombinerParameterfNV(struct _glapi_table *disp) {
+static inline _glptr_CombinerParameterfNV GET_CombinerParameterfNV(struct _glapi_table *disp) {
    return (_glptr_CombinerParameterfNV) (GET_by_offset(disp, _gloffset_CombinerParameterfNV));
 }
 
-static INLINE void SET_CombinerParameterfNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+static inline void SET_CombinerParameterfNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
    SET_by_offset(disp, _gloffset_CombinerParameterfNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CombinerParameterfvNV)(GLenum, const GLfloat *);
 #define CALL_CombinerParameterfvNV(disp, parameters) \
     (* GET_CombinerParameterfvNV(disp)) parameters
-static INLINE _glptr_CombinerParameterfvNV GET_CombinerParameterfvNV(struct _glapi_table *disp) {
+static inline _glptr_CombinerParameterfvNV GET_CombinerParameterfvNV(struct _glapi_table *disp) {
    return (_glptr_CombinerParameterfvNV) (GET_by_offset(disp, _gloffset_CombinerParameterfvNV));
 }
 
-static INLINE void SET_CombinerParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_CombinerParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_CombinerParameterfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CombinerParameteriNV)(GLenum, GLint);
 #define CALL_CombinerParameteriNV(disp, parameters) \
     (* GET_CombinerParameteriNV(disp)) parameters
-static INLINE _glptr_CombinerParameteriNV GET_CombinerParameteriNV(struct _glapi_table *disp) {
+static inline _glptr_CombinerParameteriNV GET_CombinerParameteriNV(struct _glapi_table *disp) {
    return (_glptr_CombinerParameteriNV) (GET_by_offset(disp, _gloffset_CombinerParameteriNV));
 }
 
-static INLINE void SET_CombinerParameteriNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_CombinerParameteriNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_CombinerParameteriNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_CombinerParameterivNV)(GLenum, const GLint *);
 #define CALL_CombinerParameterivNV(disp, parameters) \
     (* GET_CombinerParameterivNV(disp)) parameters
-static INLINE _glptr_CombinerParameterivNV GET_CombinerParameterivNV(struct _glapi_table *disp) {
+static inline _glptr_CombinerParameterivNV GET_CombinerParameterivNV(struct _glapi_table *disp) {
    return (_glptr_CombinerParameterivNV) (GET_by_offset(disp, _gloffset_CombinerParameterivNV));
 }
 
-static INLINE void SET_CombinerParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_CombinerParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_CombinerParameterivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FinalCombinerInputNV)(GLenum, GLenum, GLenum, GLenum);
 #define CALL_FinalCombinerInputNV(disp, parameters) \
     (* GET_FinalCombinerInputNV(disp)) parameters
-static INLINE _glptr_FinalCombinerInputNV GET_FinalCombinerInputNV(struct _glapi_table *disp) {
+static inline _glptr_FinalCombinerInputNV GET_FinalCombinerInputNV(struct _glapi_table *disp) {
    return (_glptr_FinalCombinerInputNV) (GET_by_offset(disp, _gloffset_FinalCombinerInputNV));
 }
 
-static INLINE void SET_FinalCombinerInputNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
+static inline void SET_FinalCombinerInputNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_FinalCombinerInputNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetCombinerInputParameterfvNV)(GLenum, GLenum, GLenum, GLenum, GLfloat *);
 #define CALL_GetCombinerInputParameterfvNV(disp, parameters) \
     (* GET_GetCombinerInputParameterfvNV(disp)) parameters
-static INLINE _glptr_GetCombinerInputParameterfvNV GET_GetCombinerInputParameterfvNV(struct _glapi_table *disp) {
+static inline _glptr_GetCombinerInputParameterfvNV GET_GetCombinerInputParameterfvNV(struct _glapi_table *disp) {
    return (_glptr_GetCombinerInputParameterfvNV) (GET_by_offset(disp, _gloffset_GetCombinerInputParameterfvNV));
 }
 
-static INLINE void SET_GetCombinerInputParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetCombinerInputParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetCombinerInputParameterfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetCombinerInputParameterivNV)(GLenum, GLenum, GLenum, GLenum, GLint *);
 #define CALL_GetCombinerInputParameterivNV(disp, parameters) \
     (* GET_GetCombinerInputParameterivNV(disp)) parameters
-static INLINE _glptr_GetCombinerInputParameterivNV GET_GetCombinerInputParameterivNV(struct _glapi_table *disp) {
+static inline _glptr_GetCombinerInputParameterivNV GET_GetCombinerInputParameterivNV(struct _glapi_table *disp) {
    return (_glptr_GetCombinerInputParameterivNV) (GET_by_offset(disp, _gloffset_GetCombinerInputParameterivNV));
 }
 
-static INLINE void SET_GetCombinerInputParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLint *)) {
+static inline void SET_GetCombinerInputParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetCombinerInputParameterivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetCombinerOutputParameterfvNV)(GLenum, GLenum, GLenum, GLfloat *);
 #define CALL_GetCombinerOutputParameterfvNV(disp, parameters) \
     (* GET_GetCombinerOutputParameterfvNV(disp)) parameters
-static INLINE _glptr_GetCombinerOutputParameterfvNV GET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp) {
+static inline _glptr_GetCombinerOutputParameterfvNV GET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp) {
    return (_glptr_GetCombinerOutputParameterfvNV) (GET_by_offset(disp, _gloffset_GetCombinerOutputParameterfvNV));
 }
 
-static INLINE void SET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetCombinerOutputParameterfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetCombinerOutputParameterivNV)(GLenum, GLenum, GLenum, GLint *);
 #define CALL_GetCombinerOutputParameterivNV(disp, parameters) \
     (* GET_GetCombinerOutputParameterivNV(disp)) parameters
-static INLINE _glptr_GetCombinerOutputParameterivNV GET_GetCombinerOutputParameterivNV(struct _glapi_table *disp) {
+static inline _glptr_GetCombinerOutputParameterivNV GET_GetCombinerOutputParameterivNV(struct _glapi_table *disp) {
    return (_glptr_GetCombinerOutputParameterivNV) (GET_by_offset(disp, _gloffset_GetCombinerOutputParameterivNV));
 }
 
-static INLINE void SET_GetCombinerOutputParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLint *)) {
+static inline void SET_GetCombinerOutputParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetCombinerOutputParameterivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetFinalCombinerInputParameterfvNV)(GLenum, GLenum, GLfloat *);
 #define CALL_GetFinalCombinerInputParameterfvNV(disp, parameters) \
     (* GET_GetFinalCombinerInputParameterfvNV(disp)) parameters
-static INLINE _glptr_GetFinalCombinerInputParameterfvNV GET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp) {
+static inline _glptr_GetFinalCombinerInputParameterfvNV GET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp) {
    return (_glptr_GetFinalCombinerInputParameterfvNV) (GET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterfvNV));
 }
 
-static INLINE void SET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
+static inline void SET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetFinalCombinerInputParameterivNV)(GLenum, GLenum, GLint *);
 #define CALL_GetFinalCombinerInputParameterivNV(disp, parameters) \
     (* GET_GetFinalCombinerInputParameterivNV(disp)) parameters
-static INLINE _glptr_GetFinalCombinerInputParameterivNV GET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp) {
+static inline _glptr_GetFinalCombinerInputParameterivNV GET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp) {
    return (_glptr_GetFinalCombinerInputParameterivNV) (GET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterivNV));
 }
 
-static INLINE void SET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ResizeBuffersMESA)(void);
 #define CALL_ResizeBuffersMESA(disp, parameters) \
     (* GET_ResizeBuffersMESA(disp)) parameters
-static INLINE _glptr_ResizeBuffersMESA GET_ResizeBuffersMESA(struct _glapi_table *disp) {
+static inline _glptr_ResizeBuffersMESA GET_ResizeBuffersMESA(struct _glapi_table *disp) {
    return (_glptr_ResizeBuffersMESA) (GET_by_offset(disp, _gloffset_ResizeBuffersMESA));
 }
 
-static INLINE void SET_ResizeBuffersMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_ResizeBuffersMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_ResizeBuffersMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2dMESA)(GLdouble, GLdouble);
 #define CALL_WindowPos2dMESA(disp, parameters) \
     (* GET_WindowPos2dMESA(disp)) parameters
-static INLINE _glptr_WindowPos2dMESA GET_WindowPos2dMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2dMESA GET_WindowPos2dMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2dMESA) (GET_by_offset(disp, _gloffset_WindowPos2dMESA));
 }
 
-static INLINE void SET_WindowPos2dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
+static inline void SET_WindowPos2dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_WindowPos2dMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2dvMESA)(const GLdouble *);
 #define CALL_WindowPos2dvMESA(disp, parameters) \
     (* GET_WindowPos2dvMESA(disp)) parameters
-static INLINE _glptr_WindowPos2dvMESA GET_WindowPos2dvMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2dvMESA GET_WindowPos2dvMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2dvMESA) (GET_by_offset(disp, _gloffset_WindowPos2dvMESA));
 }
 
-static INLINE void SET_WindowPos2dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_WindowPos2dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_WindowPos2dvMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2fMESA)(GLfloat, GLfloat);
 #define CALL_WindowPos2fMESA(disp, parameters) \
     (* GET_WindowPos2fMESA(disp)) parameters
-static INLINE _glptr_WindowPos2fMESA GET_WindowPos2fMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2fMESA GET_WindowPos2fMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2fMESA) (GET_by_offset(disp, _gloffset_WindowPos2fMESA));
 }
 
-static INLINE void SET_WindowPos2fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+static inline void SET_WindowPos2fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_WindowPos2fMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2fvMESA)(const GLfloat *);
 #define CALL_WindowPos2fvMESA(disp, parameters) \
     (* GET_WindowPos2fvMESA(disp)) parameters
-static INLINE _glptr_WindowPos2fvMESA GET_WindowPos2fvMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2fvMESA GET_WindowPos2fvMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2fvMESA) (GET_by_offset(disp, _gloffset_WindowPos2fvMESA));
 }
 
-static INLINE void SET_WindowPos2fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_WindowPos2fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_WindowPos2fvMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2iMESA)(GLint, GLint);
 #define CALL_WindowPos2iMESA(disp, parameters) \
     (* GET_WindowPos2iMESA(disp)) parameters
-static INLINE _glptr_WindowPos2iMESA GET_WindowPos2iMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2iMESA GET_WindowPos2iMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2iMESA) (GET_by_offset(disp, _gloffset_WindowPos2iMESA));
 }
 
-static INLINE void SET_WindowPos2iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+static inline void SET_WindowPos2iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
    SET_by_offset(disp, _gloffset_WindowPos2iMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2ivMESA)(const GLint *);
 #define CALL_WindowPos2ivMESA(disp, parameters) \
     (* GET_WindowPos2ivMESA(disp)) parameters
-static INLINE _glptr_WindowPos2ivMESA GET_WindowPos2ivMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2ivMESA GET_WindowPos2ivMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2ivMESA) (GET_by_offset(disp, _gloffset_WindowPos2ivMESA));
 }
 
-static INLINE void SET_WindowPos2ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_WindowPos2ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_WindowPos2ivMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2sMESA)(GLshort, GLshort);
 #define CALL_WindowPos2sMESA(disp, parameters) \
     (* GET_WindowPos2sMESA(disp)) parameters
-static INLINE _glptr_WindowPos2sMESA GET_WindowPos2sMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2sMESA GET_WindowPos2sMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2sMESA) (GET_by_offset(disp, _gloffset_WindowPos2sMESA));
 }
 
-static INLINE void SET_WindowPos2sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
+static inline void SET_WindowPos2sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_WindowPos2sMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos2svMESA)(const GLshort *);
 #define CALL_WindowPos2svMESA(disp, parameters) \
     (* GET_WindowPos2svMESA(disp)) parameters
-static INLINE _glptr_WindowPos2svMESA GET_WindowPos2svMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos2svMESA GET_WindowPos2svMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos2svMESA) (GET_by_offset(disp, _gloffset_WindowPos2svMESA));
 }
 
-static INLINE void SET_WindowPos2svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_WindowPos2svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_WindowPos2svMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3dMESA)(GLdouble, GLdouble, GLdouble);
 #define CALL_WindowPos3dMESA(disp, parameters) \
     (* GET_WindowPos3dMESA(disp)) parameters
-static INLINE _glptr_WindowPos3dMESA GET_WindowPos3dMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3dMESA GET_WindowPos3dMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3dMESA) (GET_by_offset(disp, _gloffset_WindowPos3dMESA));
 }
 
-static INLINE void SET_WindowPos3dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+static inline void SET_WindowPos3dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_WindowPos3dMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3dvMESA)(const GLdouble *);
 #define CALL_WindowPos3dvMESA(disp, parameters) \
     (* GET_WindowPos3dvMESA(disp)) parameters
-static INLINE _glptr_WindowPos3dvMESA GET_WindowPos3dvMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3dvMESA GET_WindowPos3dvMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3dvMESA) (GET_by_offset(disp, _gloffset_WindowPos3dvMESA));
 }
 
-static INLINE void SET_WindowPos3dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_WindowPos3dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_WindowPos3dvMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3fMESA)(GLfloat, GLfloat, GLfloat);
 #define CALL_WindowPos3fMESA(disp, parameters) \
     (* GET_WindowPos3fMESA(disp)) parameters
-static INLINE _glptr_WindowPos3fMESA GET_WindowPos3fMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3fMESA GET_WindowPos3fMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3fMESA) (GET_by_offset(disp, _gloffset_WindowPos3fMESA));
 }
 
-static INLINE void SET_WindowPos3fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+static inline void SET_WindowPos3fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_WindowPos3fMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3fvMESA)(const GLfloat *);
 #define CALL_WindowPos3fvMESA(disp, parameters) \
     (* GET_WindowPos3fvMESA(disp)) parameters
-static INLINE _glptr_WindowPos3fvMESA GET_WindowPos3fvMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3fvMESA GET_WindowPos3fvMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3fvMESA) (GET_by_offset(disp, _gloffset_WindowPos3fvMESA));
 }
 
-static INLINE void SET_WindowPos3fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_WindowPos3fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_WindowPos3fvMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3iMESA)(GLint, GLint, GLint);
 #define CALL_WindowPos3iMESA(disp, parameters) \
     (* GET_WindowPos3iMESA(disp)) parameters
-static INLINE _glptr_WindowPos3iMESA GET_WindowPos3iMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3iMESA GET_WindowPos3iMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3iMESA) (GET_by_offset(disp, _gloffset_WindowPos3iMESA));
 }
 
-static INLINE void SET_WindowPos3iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+static inline void SET_WindowPos3iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_WindowPos3iMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3ivMESA)(const GLint *);
 #define CALL_WindowPos3ivMESA(disp, parameters) \
     (* GET_WindowPos3ivMESA(disp)) parameters
-static INLINE _glptr_WindowPos3ivMESA GET_WindowPos3ivMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3ivMESA GET_WindowPos3ivMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3ivMESA) (GET_by_offset(disp, _gloffset_WindowPos3ivMESA));
 }
 
-static INLINE void SET_WindowPos3ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_WindowPos3ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_WindowPos3ivMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3sMESA)(GLshort, GLshort, GLshort);
 #define CALL_WindowPos3sMESA(disp, parameters) \
     (* GET_WindowPos3sMESA(disp)) parameters
-static INLINE _glptr_WindowPos3sMESA GET_WindowPos3sMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3sMESA GET_WindowPos3sMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3sMESA) (GET_by_offset(disp, _gloffset_WindowPos3sMESA));
 }
 
-static INLINE void SET_WindowPos3sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+static inline void SET_WindowPos3sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_WindowPos3sMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos3svMESA)(const GLshort *);
 #define CALL_WindowPos3svMESA(disp, parameters) \
     (* GET_WindowPos3svMESA(disp)) parameters
-static INLINE _glptr_WindowPos3svMESA GET_WindowPos3svMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos3svMESA GET_WindowPos3svMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos3svMESA) (GET_by_offset(disp, _gloffset_WindowPos3svMESA));
 }
 
-static INLINE void SET_WindowPos3svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_WindowPos3svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_WindowPos3svMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4dMESA)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_WindowPos4dMESA(disp, parameters) \
     (* GET_WindowPos4dMESA(disp)) parameters
-static INLINE _glptr_WindowPos4dMESA GET_WindowPos4dMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4dMESA GET_WindowPos4dMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4dMESA) (GET_by_offset(disp, _gloffset_WindowPos4dMESA));
 }
 
-static INLINE void SET_WindowPos4dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_WindowPos4dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_WindowPos4dMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4dvMESA)(const GLdouble *);
 #define CALL_WindowPos4dvMESA(disp, parameters) \
     (* GET_WindowPos4dvMESA(disp)) parameters
-static INLINE _glptr_WindowPos4dvMESA GET_WindowPos4dvMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4dvMESA GET_WindowPos4dvMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4dvMESA) (GET_by_offset(disp, _gloffset_WindowPos4dvMESA));
 }
 
-static INLINE void SET_WindowPos4dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+static inline void SET_WindowPos4dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
    SET_by_offset(disp, _gloffset_WindowPos4dvMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4fMESA)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_WindowPos4fMESA(disp, parameters) \
     (* GET_WindowPos4fMESA(disp)) parameters
-static INLINE _glptr_WindowPos4fMESA GET_WindowPos4fMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4fMESA GET_WindowPos4fMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4fMESA) (GET_by_offset(disp, _gloffset_WindowPos4fMESA));
 }
 
-static INLINE void SET_WindowPos4fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_WindowPos4fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_WindowPos4fMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4fvMESA)(const GLfloat *);
 #define CALL_WindowPos4fvMESA(disp, parameters) \
     (* GET_WindowPos4fvMESA(disp)) parameters
-static INLINE _glptr_WindowPos4fvMESA GET_WindowPos4fvMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4fvMESA GET_WindowPos4fvMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4fvMESA) (GET_by_offset(disp, _gloffset_WindowPos4fvMESA));
 }
 
-static INLINE void SET_WindowPos4fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+static inline void SET_WindowPos4fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
    SET_by_offset(disp, _gloffset_WindowPos4fvMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4iMESA)(GLint, GLint, GLint, GLint);
 #define CALL_WindowPos4iMESA(disp, parameters) \
     (* GET_WindowPos4iMESA(disp)) parameters
-static INLINE _glptr_WindowPos4iMESA GET_WindowPos4iMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4iMESA GET_WindowPos4iMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4iMESA) (GET_by_offset(disp, _gloffset_WindowPos4iMESA));
 }
 
-static INLINE void SET_WindowPos4iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_WindowPos4iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_WindowPos4iMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4ivMESA)(const GLint *);
 #define CALL_WindowPos4ivMESA(disp, parameters) \
     (* GET_WindowPos4ivMESA(disp)) parameters
-static INLINE _glptr_WindowPos4ivMESA GET_WindowPos4ivMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4ivMESA GET_WindowPos4ivMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4ivMESA) (GET_by_offset(disp, _gloffset_WindowPos4ivMESA));
 }
 
-static INLINE void SET_WindowPos4ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+static inline void SET_WindowPos4ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
    SET_by_offset(disp, _gloffset_WindowPos4ivMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4sMESA)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_WindowPos4sMESA(disp, parameters) \
     (* GET_WindowPos4sMESA(disp)) parameters
-static INLINE _glptr_WindowPos4sMESA GET_WindowPos4sMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4sMESA GET_WindowPos4sMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4sMESA) (GET_by_offset(disp, _gloffset_WindowPos4sMESA));
 }
 
-static INLINE void SET_WindowPos4sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_WindowPos4sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_WindowPos4sMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_WindowPos4svMESA)(const GLshort *);
 #define CALL_WindowPos4svMESA(disp, parameters) \
     (* GET_WindowPos4svMESA(disp)) parameters
-static INLINE _glptr_WindowPos4svMESA GET_WindowPos4svMESA(struct _glapi_table *disp) {
+static inline _glptr_WindowPos4svMESA GET_WindowPos4svMESA(struct _glapi_table *disp) {
    return (_glptr_WindowPos4svMESA) (GET_by_offset(disp, _gloffset_WindowPos4svMESA));
 }
 
-static INLINE void SET_WindowPos4svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+static inline void SET_WindowPos4svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
    SET_by_offset(disp, _gloffset_WindowPos4svMESA, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiModeDrawArraysIBM)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
 #define CALL_MultiModeDrawArraysIBM(disp, parameters) \
     (* GET_MultiModeDrawArraysIBM(disp)) parameters
-static INLINE _glptr_MultiModeDrawArraysIBM GET_MultiModeDrawArraysIBM(struct _glapi_table *disp) {
+static inline _glptr_MultiModeDrawArraysIBM GET_MultiModeDrawArraysIBM(struct _glapi_table *disp) {
    return (_glptr_MultiModeDrawArraysIBM) (GET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM));
 }
 
-static INLINE void SET_MultiModeDrawArraysIBM(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint)) {
+static inline void SET_MultiModeDrawArraysIBM(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint)) {
    SET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_MultiModeDrawElementsIBM)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint);
 #define CALL_MultiModeDrawElementsIBM(disp, parameters) \
     (* GET_MultiModeDrawElementsIBM(disp)) parameters
-static INLINE _glptr_MultiModeDrawElementsIBM GET_MultiModeDrawElementsIBM(struct _glapi_table *disp) {
+static inline _glptr_MultiModeDrawElementsIBM GET_MultiModeDrawElementsIBM(struct _glapi_table *disp) {
    return (_glptr_MultiModeDrawElementsIBM) (GET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM));
 }
 
-static INLINE void SET_MultiModeDrawElementsIBM(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint)) {
+static inline void SET_MultiModeDrawElementsIBM(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint)) {
    SET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteFencesNV)(GLsizei, const GLuint *);
 #define CALL_DeleteFencesNV(disp, parameters) \
     (* GET_DeleteFencesNV(disp)) parameters
-static INLINE _glptr_DeleteFencesNV GET_DeleteFencesNV(struct _glapi_table *disp) {
+static inline _glptr_DeleteFencesNV GET_DeleteFencesNV(struct _glapi_table *disp) {
    return (_glptr_DeleteFencesNV) (GET_by_offset(disp, _gloffset_DeleteFencesNV));
 }
 
-static INLINE void SET_DeleteFencesNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteFencesNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteFencesNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FinishFenceNV)(GLuint);
 #define CALL_FinishFenceNV(disp, parameters) \
     (* GET_FinishFenceNV(disp)) parameters
-static INLINE _glptr_FinishFenceNV GET_FinishFenceNV(struct _glapi_table *disp) {
+static inline _glptr_FinishFenceNV GET_FinishFenceNV(struct _glapi_table *disp) {
    return (_glptr_FinishFenceNV) (GET_by_offset(disp, _gloffset_FinishFenceNV));
 }
 
-static INLINE void SET_FinishFenceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_FinishFenceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_FinishFenceNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenFencesNV)(GLsizei, GLuint *);
 #define CALL_GenFencesNV(disp, parameters) \
     (* GET_GenFencesNV(disp)) parameters
-static INLINE _glptr_GenFencesNV GET_GenFencesNV(struct _glapi_table *disp) {
+static inline _glptr_GenFencesNV GET_GenFencesNV(struct _glapi_table *disp) {
    return (_glptr_GenFencesNV) (GET_by_offset(disp, _gloffset_GenFencesNV));
 }
 
-static INLINE void SET_GenFencesNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenFencesNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenFencesNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetFenceivNV)(GLuint, GLenum, GLint *);
 #define CALL_GetFenceivNV(disp, parameters) \
     (* GET_GetFenceivNV(disp)) parameters
-static INLINE _glptr_GetFenceivNV GET_GetFenceivNV(struct _glapi_table *disp) {
+static inline _glptr_GetFenceivNV GET_GetFenceivNV(struct _glapi_table *disp) {
    return (_glptr_GetFenceivNV) (GET_by_offset(disp, _gloffset_GetFenceivNV));
 }
 
-static INLINE void SET_GetFenceivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetFenceivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetFenceivNV, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsFenceNV)(GLuint);
 #define CALL_IsFenceNV(disp, parameters) \
     (* GET_IsFenceNV(disp)) parameters
-static INLINE _glptr_IsFenceNV GET_IsFenceNV(struct _glapi_table *disp) {
+static inline _glptr_IsFenceNV GET_IsFenceNV(struct _glapi_table *disp) {
    return (_glptr_IsFenceNV) (GET_by_offset(disp, _gloffset_IsFenceNV));
 }
 
-static INLINE void SET_IsFenceNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsFenceNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsFenceNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SetFenceNV)(GLuint, GLenum);
 #define CALL_SetFenceNV(disp, parameters) \
     (* GET_SetFenceNV(disp)) parameters
-static INLINE _glptr_SetFenceNV GET_SetFenceNV(struct _glapi_table *disp) {
+static inline _glptr_SetFenceNV GET_SetFenceNV(struct _glapi_table *disp) {
    return (_glptr_SetFenceNV) (GET_by_offset(disp, _gloffset_SetFenceNV));
 }
 
-static INLINE void SET_SetFenceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
+static inline void SET_SetFenceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_SetFenceNV, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_TestFenceNV)(GLuint);
 #define CALL_TestFenceNV(disp, parameters) \
     (* GET_TestFenceNV(disp)) parameters
-static INLINE _glptr_TestFenceNV GET_TestFenceNV(struct _glapi_table *disp) {
+static inline _glptr_TestFenceNV GET_TestFenceNV(struct _glapi_table *disp) {
    return (_glptr_TestFenceNV) (GET_by_offset(disp, _gloffset_TestFenceNV));
 }
 
-static INLINE void SET_TestFenceNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_TestFenceNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_TestFenceNV, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_AreProgramsResidentNV)(GLsizei, const GLuint *, GLboolean *);
 #define CALL_AreProgramsResidentNV(disp, parameters) \
     (* GET_AreProgramsResidentNV(disp)) parameters
-static INLINE _glptr_AreProgramsResidentNV GET_AreProgramsResidentNV(struct _glapi_table *disp) {
+static inline _glptr_AreProgramsResidentNV GET_AreProgramsResidentNV(struct _glapi_table *disp) {
    return (_glptr_AreProgramsResidentNV) (GET_by_offset(disp, _gloffset_AreProgramsResidentNV));
 }
 
-static INLINE void SET_AreProgramsResidentNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLboolean *)) {
+static inline void SET_AreProgramsResidentNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLboolean *)) {
    SET_by_offset(disp, _gloffset_AreProgramsResidentNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindProgramNV)(GLenum, GLuint);
 #define CALL_BindProgramNV(disp, parameters) \
     (* GET_BindProgramNV(disp)) parameters
-static INLINE _glptr_BindProgramNV GET_BindProgramNV(struct _glapi_table *disp) {
+static inline _glptr_BindProgramNV GET_BindProgramNV(struct _glapi_table *disp) {
    return (_glptr_BindProgramNV) (GET_by_offset(disp, _gloffset_BindProgramNV));
 }
 
-static INLINE void SET_BindProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BindProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BindProgramNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteProgramsNV)(GLsizei, const GLuint *);
 #define CALL_DeleteProgramsNV(disp, parameters) \
     (* GET_DeleteProgramsNV(disp)) parameters
-static INLINE _glptr_DeleteProgramsNV GET_DeleteProgramsNV(struct _glapi_table *disp) {
+static inline _glptr_DeleteProgramsNV GET_DeleteProgramsNV(struct _glapi_table *disp) {
    return (_glptr_DeleteProgramsNV) (GET_by_offset(disp, _gloffset_DeleteProgramsNV));
 }
 
-static INLINE void SET_DeleteProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteProgramsNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ExecuteProgramNV)(GLenum, GLuint, const GLfloat *);
 #define CALL_ExecuteProgramNV(disp, parameters) \
     (* GET_ExecuteProgramNV(disp)) parameters
-static INLINE _glptr_ExecuteProgramNV GET_ExecuteProgramNV(struct _glapi_table *disp) {
+static inline _glptr_ExecuteProgramNV GET_ExecuteProgramNV(struct _glapi_table *disp) {
    return (_glptr_ExecuteProgramNV) (GET_by_offset(disp, _gloffset_ExecuteProgramNV));
 }
 
-static INLINE void SET_ExecuteProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
+static inline void SET_ExecuteProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ExecuteProgramNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenProgramsNV)(GLsizei, GLuint *);
 #define CALL_GenProgramsNV(disp, parameters) \
     (* GET_GenProgramsNV(disp)) parameters
-static INLINE _glptr_GenProgramsNV GET_GenProgramsNV(struct _glapi_table *disp) {
+static inline _glptr_GenProgramsNV GET_GenProgramsNV(struct _glapi_table *disp) {
    return (_glptr_GenProgramsNV) (GET_by_offset(disp, _gloffset_GenProgramsNV));
 }
 
-static INLINE void SET_GenProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenProgramsNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramParameterdvNV)(GLenum, GLuint, GLenum, GLdouble *);
 #define CALL_GetProgramParameterdvNV(disp, parameters) \
     (* GET_GetProgramParameterdvNV(disp)) parameters
-static INLINE _glptr_GetProgramParameterdvNV GET_GetProgramParameterdvNV(struct _glapi_table *disp) {
+static inline _glptr_GetProgramParameterdvNV GET_GetProgramParameterdvNV(struct _glapi_table *disp) {
    return (_glptr_GetProgramParameterdvNV) (GET_by_offset(disp, _gloffset_GetProgramParameterdvNV));
 }
 
-static INLINE void SET_GetProgramParameterdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLdouble *)) {
+static inline void SET_GetProgramParameterdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetProgramParameterdvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramParameterfvNV)(GLenum, GLuint, GLenum, GLfloat *);
 #define CALL_GetProgramParameterfvNV(disp, parameters) \
     (* GET_GetProgramParameterfvNV(disp)) parameters
-static INLINE _glptr_GetProgramParameterfvNV GET_GetProgramParameterfvNV(struct _glapi_table *disp) {
+static inline _glptr_GetProgramParameterfvNV GET_GetProgramParameterfvNV(struct _glapi_table *disp) {
    return (_glptr_GetProgramParameterfvNV) (GET_by_offset(disp, _gloffset_GetProgramParameterfvNV));
 }
 
-static INLINE void SET_GetProgramParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLfloat *)) {
+static inline void SET_GetProgramParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetProgramParameterfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramStringNV)(GLuint, GLenum, GLubyte *);
 #define CALL_GetProgramStringNV(disp, parameters) \
     (* GET_GetProgramStringNV(disp)) parameters
-static INLINE _glptr_GetProgramStringNV GET_GetProgramStringNV(struct _glapi_table *disp) {
+static inline _glptr_GetProgramStringNV GET_GetProgramStringNV(struct _glapi_table *disp) {
    return (_glptr_GetProgramStringNV) (GET_by_offset(disp, _gloffset_GetProgramStringNV));
 }
 
-static INLINE void SET_GetProgramStringNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLubyte *)) {
+static inline void SET_GetProgramStringNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLubyte *)) {
    SET_by_offset(disp, _gloffset_GetProgramStringNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramivNV)(GLuint, GLenum, GLint *);
 #define CALL_GetProgramivNV(disp, parameters) \
     (* GET_GetProgramivNV(disp)) parameters
-static INLINE _glptr_GetProgramivNV GET_GetProgramivNV(struct _glapi_table *disp) {
+static inline _glptr_GetProgramivNV GET_GetProgramivNV(struct _glapi_table *disp) {
    return (_glptr_GetProgramivNV) (GET_by_offset(disp, _gloffset_GetProgramivNV));
 }
 
-static INLINE void SET_GetProgramivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetProgramivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetProgramivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTrackMatrixivNV)(GLenum, GLuint, GLenum, GLint *);
 #define CALL_GetTrackMatrixivNV(disp, parameters) \
     (* GET_GetTrackMatrixivNV(disp)) parameters
-static INLINE _glptr_GetTrackMatrixivNV GET_GetTrackMatrixivNV(struct _glapi_table *disp) {
+static inline _glptr_GetTrackMatrixivNV GET_GetTrackMatrixivNV(struct _glapi_table *disp) {
    return (_glptr_GetTrackMatrixivNV) (GET_by_offset(disp, _gloffset_GetTrackMatrixivNV));
 }
 
-static INLINE void SET_GetTrackMatrixivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
+static inline void SET_GetTrackMatrixivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTrackMatrixivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribPointervNV)(GLuint, GLenum, GLvoid **);
 #define CALL_GetVertexAttribPointervNV(disp, parameters) \
     (* GET_GetVertexAttribPointervNV(disp)) parameters
-static INLINE _glptr_GetVertexAttribPointervNV GET_GetVertexAttribPointervNV(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribPointervNV GET_GetVertexAttribPointervNV(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribPointervNV) (GET_by_offset(disp, _gloffset_GetVertexAttribPointervNV));
 }
 
-static INLINE void SET_GetVertexAttribPointervNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLvoid **)) {
+static inline void SET_GetVertexAttribPointervNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLvoid **)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribPointervNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvNV)(GLuint, GLenum, GLdouble *);
 #define CALL_GetVertexAttribdvNV(disp, parameters) \
     (* GET_GetVertexAttribdvNV(disp)) parameters
-static INLINE _glptr_GetVertexAttribdvNV GET_GetVertexAttribdvNV(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribdvNV GET_GetVertexAttribdvNV(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribdvNV) (GET_by_offset(disp, _gloffset_GetVertexAttribdvNV));
 }
 
-static INLINE void SET_GetVertexAttribdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) {
+static inline void SET_GetVertexAttribdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribdvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvNV)(GLuint, GLenum, GLfloat *);
 #define CALL_GetVertexAttribfvNV(disp, parameters) \
     (* GET_GetVertexAttribfvNV(disp)) parameters
-static INLINE _glptr_GetVertexAttribfvNV GET_GetVertexAttribfvNV(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribfvNV GET_GetVertexAttribfvNV(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribfvNV) (GET_by_offset(disp, _gloffset_GetVertexAttribfvNV));
 }
 
-static INLINE void SET_GetVertexAttribfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
+static inline void SET_GetVertexAttribfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribivNV)(GLuint, GLenum, GLint *);
 #define CALL_GetVertexAttribivNV(disp, parameters) \
     (* GET_GetVertexAttribivNV(disp)) parameters
-static INLINE _glptr_GetVertexAttribivNV GET_GetVertexAttribivNV(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribivNV GET_GetVertexAttribivNV(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribivNV) (GET_by_offset(disp, _gloffset_GetVertexAttribivNV));
 }
 
-static INLINE void SET_GetVertexAttribivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetVertexAttribivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribivNV, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsProgramNV)(GLuint);
 #define CALL_IsProgramNV(disp, parameters) \
     (* GET_IsProgramNV(disp)) parameters
-static INLINE _glptr_IsProgramNV GET_IsProgramNV(struct _glapi_table *disp) {
+static inline _glptr_IsProgramNV GET_IsProgramNV(struct _glapi_table *disp) {
    return (_glptr_IsProgramNV) (GET_by_offset(disp, _gloffset_IsProgramNV));
 }
 
-static INLINE void SET_IsProgramNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsProgramNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsProgramNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_LoadProgramNV)(GLenum, GLuint, GLsizei, const GLubyte *);
 #define CALL_LoadProgramNV(disp, parameters) \
     (* GET_LoadProgramNV(disp)) parameters
-static INLINE _glptr_LoadProgramNV GET_LoadProgramNV(struct _glapi_table *disp) {
+static inline _glptr_LoadProgramNV GET_LoadProgramNV(struct _glapi_table *disp) {
    return (_glptr_LoadProgramNV) (GET_by_offset(disp, _gloffset_LoadProgramNV));
 }
 
-static INLINE void SET_LoadProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLubyte *)) {
+static inline void SET_LoadProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_LoadProgramNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramParameters4dvNV)(GLenum, GLuint, GLsizei, const GLdouble *);
 #define CALL_ProgramParameters4dvNV(disp, parameters) \
     (* GET_ProgramParameters4dvNV(disp)) parameters
-static INLINE _glptr_ProgramParameters4dvNV GET_ProgramParameters4dvNV(struct _glapi_table *disp) {
+static inline _glptr_ProgramParameters4dvNV GET_ProgramParameters4dvNV(struct _glapi_table *disp) {
    return (_glptr_ProgramParameters4dvNV) (GET_by_offset(disp, _gloffset_ProgramParameters4dvNV));
 }
 
-static INLINE void SET_ProgramParameters4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLdouble *)) {
+static inline void SET_ProgramParameters4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_ProgramParameters4dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramParameters4fvNV)(GLenum, GLuint, GLsizei, const GLfloat *);
 #define CALL_ProgramParameters4fvNV(disp, parameters) \
     (* GET_ProgramParameters4fvNV(disp)) parameters
-static INLINE _glptr_ProgramParameters4fvNV GET_ProgramParameters4fvNV(struct _glapi_table *disp) {
+static inline _glptr_ProgramParameters4fvNV GET_ProgramParameters4fvNV(struct _glapi_table *disp) {
    return (_glptr_ProgramParameters4fvNV) (GET_by_offset(disp, _gloffset_ProgramParameters4fvNV));
 }
 
-static INLINE void SET_ProgramParameters4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_ProgramParameters4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ProgramParameters4fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RequestResidentProgramsNV)(GLsizei, const GLuint *);
 #define CALL_RequestResidentProgramsNV(disp, parameters) \
     (* GET_RequestResidentProgramsNV(disp)) parameters
-static INLINE _glptr_RequestResidentProgramsNV GET_RequestResidentProgramsNV(struct _glapi_table *disp) {
+static inline _glptr_RequestResidentProgramsNV GET_RequestResidentProgramsNV(struct _glapi_table *disp) {
    return (_glptr_RequestResidentProgramsNV) (GET_by_offset(disp, _gloffset_RequestResidentProgramsNV));
 }
 
-static INLINE void SET_RequestResidentProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_RequestResidentProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_RequestResidentProgramsNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TrackMatrixNV)(GLenum, GLuint, GLenum, GLenum);
 #define CALL_TrackMatrixNV(disp, parameters) \
     (* GET_TrackMatrixNV(disp)) parameters
-static INLINE _glptr_TrackMatrixNV GET_TrackMatrixNV(struct _glapi_table *disp) {
+static inline _glptr_TrackMatrixNV GET_TrackMatrixNV(struct _glapi_table *disp) {
    return (_glptr_TrackMatrixNV) (GET_by_offset(disp, _gloffset_TrackMatrixNV));
 }
 
-static INLINE void SET_TrackMatrixNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLenum)) {
+static inline void SET_TrackMatrixNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_TrackMatrixNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1dNV)(GLuint, GLdouble);
 #define CALL_VertexAttrib1dNV(disp, parameters) \
     (* GET_VertexAttrib1dNV(disp)) parameters
-static INLINE _glptr_VertexAttrib1dNV GET_VertexAttrib1dNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1dNV GET_VertexAttrib1dNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1dNV) (GET_by_offset(disp, _gloffset_VertexAttrib1dNV));
 }
 
-static INLINE void SET_VertexAttrib1dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) {
+static inline void SET_VertexAttrib1dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1dNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib1dvNV(disp, parameters) \
     (* GET_VertexAttrib1dvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib1dvNV GET_VertexAttrib1dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1dvNV GET_VertexAttrib1dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib1dvNV));
 }
 
-static INLINE void SET_VertexAttrib1dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib1dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1fNV)(GLuint, GLfloat);
 #define CALL_VertexAttrib1fNV(disp, parameters) \
     (* GET_VertexAttrib1fNV(disp)) parameters
-static INLINE _glptr_VertexAttrib1fNV GET_VertexAttrib1fNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1fNV GET_VertexAttrib1fNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1fNV) (GET_by_offset(disp, _gloffset_VertexAttrib1fNV));
 }
 
-static INLINE void SET_VertexAttrib1fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) {
+static inline void SET_VertexAttrib1fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1fNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib1fvNV(disp, parameters) \
     (* GET_VertexAttrib1fvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib1fvNV GET_VertexAttrib1fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1fvNV GET_VertexAttrib1fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib1fvNV));
 }
 
-static INLINE void SET_VertexAttrib1fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib1fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1sNV)(GLuint, GLshort);
 #define CALL_VertexAttrib1sNV(disp, parameters) \
     (* GET_VertexAttrib1sNV(disp)) parameters
-static INLINE _glptr_VertexAttrib1sNV GET_VertexAttrib1sNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1sNV GET_VertexAttrib1sNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1sNV) (GET_by_offset(disp, _gloffset_VertexAttrib1sNV));
 }
 
-static INLINE void SET_VertexAttrib1sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) {
+static inline void SET_VertexAttrib1sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1sNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib1svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib1svNV(disp, parameters) \
     (* GET_VertexAttrib1svNV(disp)) parameters
-static INLINE _glptr_VertexAttrib1svNV GET_VertexAttrib1svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib1svNV GET_VertexAttrib1svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib1svNV) (GET_by_offset(disp, _gloffset_VertexAttrib1svNV));
 }
 
-static INLINE void SET_VertexAttrib1svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib1svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib1svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2dNV)(GLuint, GLdouble, GLdouble);
 #define CALL_VertexAttrib2dNV(disp, parameters) \
     (* GET_VertexAttrib2dNV(disp)) parameters
-static INLINE _glptr_VertexAttrib2dNV GET_VertexAttrib2dNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2dNV GET_VertexAttrib2dNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2dNV) (GET_by_offset(disp, _gloffset_VertexAttrib2dNV));
 }
 
-static INLINE void SET_VertexAttrib2dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) {
+static inline void SET_VertexAttrib2dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2dNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib2dvNV(disp, parameters) \
     (* GET_VertexAttrib2dvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib2dvNV GET_VertexAttrib2dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2dvNV GET_VertexAttrib2dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib2dvNV));
 }
 
-static INLINE void SET_VertexAttrib2dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib2dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2fNV)(GLuint, GLfloat, GLfloat);
 #define CALL_VertexAttrib2fNV(disp, parameters) \
     (* GET_VertexAttrib2fNV(disp)) parameters
-static INLINE _glptr_VertexAttrib2fNV GET_VertexAttrib2fNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2fNV GET_VertexAttrib2fNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2fNV) (GET_by_offset(disp, _gloffset_VertexAttrib2fNV));
 }
 
-static INLINE void SET_VertexAttrib2fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) {
+static inline void SET_VertexAttrib2fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2fNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib2fvNV(disp, parameters) \
     (* GET_VertexAttrib2fvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib2fvNV GET_VertexAttrib2fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2fvNV GET_VertexAttrib2fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib2fvNV));
 }
 
-static INLINE void SET_VertexAttrib2fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib2fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2sNV)(GLuint, GLshort, GLshort);
 #define CALL_VertexAttrib2sNV(disp, parameters) \
     (* GET_VertexAttrib2sNV(disp)) parameters
-static INLINE _glptr_VertexAttrib2sNV GET_VertexAttrib2sNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2sNV GET_VertexAttrib2sNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2sNV) (GET_by_offset(disp, _gloffset_VertexAttrib2sNV));
 }
 
-static INLINE void SET_VertexAttrib2sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) {
+static inline void SET_VertexAttrib2sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2sNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib2svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib2svNV(disp, parameters) \
     (* GET_VertexAttrib2svNV(disp)) parameters
-static INLINE _glptr_VertexAttrib2svNV GET_VertexAttrib2svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib2svNV GET_VertexAttrib2svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib2svNV) (GET_by_offset(disp, _gloffset_VertexAttrib2svNV));
 }
 
-static INLINE void SET_VertexAttrib2svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib2svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib2svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3dNV)(GLuint, GLdouble, GLdouble, GLdouble);
 #define CALL_VertexAttrib3dNV(disp, parameters) \
     (* GET_VertexAttrib3dNV(disp)) parameters
-static INLINE _glptr_VertexAttrib3dNV GET_VertexAttrib3dNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3dNV GET_VertexAttrib3dNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3dNV) (GET_by_offset(disp, _gloffset_VertexAttrib3dNV));
 }
 
-static INLINE void SET_VertexAttrib3dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_VertexAttrib3dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3dNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib3dvNV(disp, parameters) \
     (* GET_VertexAttrib3dvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib3dvNV GET_VertexAttrib3dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3dvNV GET_VertexAttrib3dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib3dvNV));
 }
 
-static INLINE void SET_VertexAttrib3dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib3dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3fNV)(GLuint, GLfloat, GLfloat, GLfloat);
 #define CALL_VertexAttrib3fNV(disp, parameters) \
     (* GET_VertexAttrib3fNV(disp)) parameters
-static INLINE _glptr_VertexAttrib3fNV GET_VertexAttrib3fNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3fNV GET_VertexAttrib3fNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3fNV) (GET_by_offset(disp, _gloffset_VertexAttrib3fNV));
 }
 
-static INLINE void SET_VertexAttrib3fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_VertexAttrib3fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3fNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib3fvNV(disp, parameters) \
     (* GET_VertexAttrib3fvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib3fvNV GET_VertexAttrib3fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3fvNV GET_VertexAttrib3fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib3fvNV));
 }
 
-static INLINE void SET_VertexAttrib3fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib3fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3sNV)(GLuint, GLshort, GLshort, GLshort);
 #define CALL_VertexAttrib3sNV(disp, parameters) \
     (* GET_VertexAttrib3sNV(disp)) parameters
-static INLINE _glptr_VertexAttrib3sNV GET_VertexAttrib3sNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3sNV GET_VertexAttrib3sNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3sNV) (GET_by_offset(disp, _gloffset_VertexAttrib3sNV));
 }
 
-static INLINE void SET_VertexAttrib3sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) {
+static inline void SET_VertexAttrib3sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3sNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib3svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib3svNV(disp, parameters) \
     (* GET_VertexAttrib3svNV(disp)) parameters
-static INLINE _glptr_VertexAttrib3svNV GET_VertexAttrib3svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib3svNV GET_VertexAttrib3svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib3svNV) (GET_by_offset(disp, _gloffset_VertexAttrib3svNV));
 }
 
-static INLINE void SET_VertexAttrib3svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib3svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib3svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4dNV)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_VertexAttrib4dNV(disp, parameters) \
     (* GET_VertexAttrib4dNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4dNV GET_VertexAttrib4dNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4dNV GET_VertexAttrib4dNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4dNV) (GET_by_offset(disp, _gloffset_VertexAttrib4dNV));
 }
 
-static INLINE void SET_VertexAttrib4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_VertexAttrib4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4dNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib4dvNV(disp, parameters) \
     (* GET_VertexAttrib4dvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4dvNV GET_VertexAttrib4dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4dvNV GET_VertexAttrib4dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4dvNV));
 }
 
-static INLINE void SET_VertexAttrib4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+static inline void SET_VertexAttrib4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4fNV)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_VertexAttrib4fNV(disp, parameters) \
     (* GET_VertexAttrib4fNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4fNV GET_VertexAttrib4fNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4fNV GET_VertexAttrib4fNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4fNV) (GET_by_offset(disp, _gloffset_VertexAttrib4fNV));
 }
 
-static INLINE void SET_VertexAttrib4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_VertexAttrib4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4fNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib4fvNV(disp, parameters) \
     (* GET_VertexAttrib4fvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4fvNV GET_VertexAttrib4fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4fvNV GET_VertexAttrib4fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4fvNV));
 }
 
-static INLINE void SET_VertexAttrib4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_VertexAttrib4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4sNV)(GLuint, GLshort, GLshort, GLshort, GLshort);
 #define CALL_VertexAttrib4sNV(disp, parameters) \
     (* GET_VertexAttrib4sNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4sNV GET_VertexAttrib4sNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4sNV GET_VertexAttrib4sNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4sNV) (GET_by_offset(disp, _gloffset_VertexAttrib4sNV));
 }
 
-static INLINE void SET_VertexAttrib4sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) {
+static inline void SET_VertexAttrib4sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4sNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib4svNV(disp, parameters) \
     (* GET_VertexAttrib4svNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4svNV GET_VertexAttrib4svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4svNV GET_VertexAttrib4svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4svNV) (GET_by_offset(disp, _gloffset_VertexAttrib4svNV));
 }
 
-static INLINE void SET_VertexAttrib4svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttrib4svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubNV)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
 #define CALL_VertexAttrib4ubNV(disp, parameters) \
     (* GET_VertexAttrib4ubNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4ubNV GET_VertexAttrib4ubNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4ubNV GET_VertexAttrib4ubNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4ubNV) (GET_by_offset(disp, _gloffset_VertexAttrib4ubNV));
 }
 
-static INLINE void SET_VertexAttrib4ubNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) {
+static inline void SET_VertexAttrib4ubNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4ubNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvNV)(GLuint, const GLubyte *);
 #define CALL_VertexAttrib4ubvNV(disp, parameters) \
     (* GET_VertexAttrib4ubvNV(disp)) parameters
-static INLINE _glptr_VertexAttrib4ubvNV GET_VertexAttrib4ubvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttrib4ubvNV GET_VertexAttrib4ubvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttrib4ubvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4ubvNV));
 }
 
-static INLINE void SET_VertexAttrib4ubvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+static inline void SET_VertexAttrib4ubvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttrib4ubvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribPointerNV)(GLuint, GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_VertexAttribPointerNV(disp, parameters) \
     (* GET_VertexAttribPointerNV(disp)) parameters
-static INLINE _glptr_VertexAttribPointerNV GET_VertexAttribPointerNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribPointerNV GET_VertexAttribPointerNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribPointerNV) (GET_by_offset(disp, _gloffset_VertexAttribPointerNV));
 }
 
-static INLINE void SET_VertexAttribPointerNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_VertexAttribPointerNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_VertexAttribPointerNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs1dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs1dvNV(disp, parameters) \
     (* GET_VertexAttribs1dvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs1dvNV GET_VertexAttribs1dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs1dvNV GET_VertexAttribs1dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs1dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs1dvNV));
 }
 
-static INLINE void SET_VertexAttribs1dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
+static inline void SET_VertexAttribs1dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs1dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs1fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs1fvNV(disp, parameters) \
     (* GET_VertexAttribs1fvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs1fvNV GET_VertexAttribs1fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs1fvNV GET_VertexAttribs1fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs1fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs1fvNV));
 }
 
-static INLINE void SET_VertexAttribs1fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_VertexAttribs1fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs1fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs1svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs1svNV(disp, parameters) \
     (* GET_VertexAttribs1svNV(disp)) parameters
-static INLINE _glptr_VertexAttribs1svNV GET_VertexAttribs1svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs1svNV GET_VertexAttribs1svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs1svNV) (GET_by_offset(disp, _gloffset_VertexAttribs1svNV));
 }
 
-static INLINE void SET_VertexAttribs1svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
+static inline void SET_VertexAttribs1svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs1svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs2dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs2dvNV(disp, parameters) \
     (* GET_VertexAttribs2dvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs2dvNV GET_VertexAttribs2dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs2dvNV GET_VertexAttribs2dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs2dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs2dvNV));
 }
 
-static INLINE void SET_VertexAttribs2dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
+static inline void SET_VertexAttribs2dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs2dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs2fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs2fvNV(disp, parameters) \
     (* GET_VertexAttribs2fvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs2fvNV GET_VertexAttribs2fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs2fvNV GET_VertexAttribs2fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs2fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs2fvNV));
 }
 
-static INLINE void SET_VertexAttribs2fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_VertexAttribs2fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs2fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs2svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs2svNV(disp, parameters) \
     (* GET_VertexAttribs2svNV(disp)) parameters
-static INLINE _glptr_VertexAttribs2svNV GET_VertexAttribs2svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs2svNV GET_VertexAttribs2svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs2svNV) (GET_by_offset(disp, _gloffset_VertexAttribs2svNV));
 }
 
-static INLINE void SET_VertexAttribs2svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
+static inline void SET_VertexAttribs2svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs2svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs3dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs3dvNV(disp, parameters) \
     (* GET_VertexAttribs3dvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs3dvNV GET_VertexAttribs3dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs3dvNV GET_VertexAttribs3dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs3dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs3dvNV));
 }
 
-static INLINE void SET_VertexAttribs3dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
+static inline void SET_VertexAttribs3dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs3dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs3fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs3fvNV(disp, parameters) \
     (* GET_VertexAttribs3fvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs3fvNV GET_VertexAttribs3fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs3fvNV GET_VertexAttribs3fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs3fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs3fvNV));
 }
 
-static INLINE void SET_VertexAttribs3fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_VertexAttribs3fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs3fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs3svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs3svNV(disp, parameters) \
     (* GET_VertexAttribs3svNV(disp)) parameters
-static INLINE _glptr_VertexAttribs3svNV GET_VertexAttribs3svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs3svNV GET_VertexAttribs3svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs3svNV) (GET_by_offset(disp, _gloffset_VertexAttribs3svNV));
 }
 
-static INLINE void SET_VertexAttribs3svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
+static inline void SET_VertexAttribs3svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs3svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs4dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs4dvNV(disp, parameters) \
     (* GET_VertexAttribs4dvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs4dvNV GET_VertexAttribs4dvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs4dvNV GET_VertexAttribs4dvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs4dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4dvNV));
 }
 
-static INLINE void SET_VertexAttribs4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
+static inline void SET_VertexAttribs4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs4dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs4fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs4fvNV(disp, parameters) \
     (* GET_VertexAttribs4fvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs4fvNV GET_VertexAttribs4fvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs4fvNV GET_VertexAttribs4fvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs4fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4fvNV));
 }
 
-static INLINE void SET_VertexAttribs4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_VertexAttribs4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs4fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs4svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs4svNV(disp, parameters) \
     (* GET_VertexAttribs4svNV(disp)) parameters
-static INLINE _glptr_VertexAttribs4svNV GET_VertexAttribs4svNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs4svNV GET_VertexAttribs4svNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs4svNV) (GET_by_offset(disp, _gloffset_VertexAttribs4svNV));
 }
 
-static INLINE void SET_VertexAttribs4svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
+static inline void SET_VertexAttribs4svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs4svNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribs4ubvNV)(GLuint, GLsizei, const GLubyte *);
 #define CALL_VertexAttribs4ubvNV(disp, parameters) \
     (* GET_VertexAttribs4ubvNV(disp)) parameters
-static INLINE _glptr_VertexAttribs4ubvNV GET_VertexAttribs4ubvNV(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribs4ubvNV GET_VertexAttribs4ubvNV(struct _glapi_table *disp) {
    return (_glptr_VertexAttribs4ubvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4ubvNV));
 }
 
-static INLINE void SET_VertexAttribs4ubvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *)) {
+static inline void SET_VertexAttribs4ubvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttribs4ubvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterfvATI)(GLenum, GLfloat *);
 #define CALL_GetTexBumpParameterfvATI(disp, parameters) \
     (* GET_GetTexBumpParameterfvATI(disp)) parameters
-static INLINE _glptr_GetTexBumpParameterfvATI GET_GetTexBumpParameterfvATI(struct _glapi_table *disp) {
+static inline _glptr_GetTexBumpParameterfvATI GET_GetTexBumpParameterfvATI(struct _glapi_table *disp) {
    return (_glptr_GetTexBumpParameterfvATI) (GET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI));
 }
 
-static INLINE void SET_GetTexBumpParameterfvATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
+static inline void SET_GetTexBumpParameterfvATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterivATI)(GLenum, GLint *);
 #define CALL_GetTexBumpParameterivATI(disp, parameters) \
     (* GET_GetTexBumpParameterivATI(disp)) parameters
-static INLINE _glptr_GetTexBumpParameterivATI GET_GetTexBumpParameterivATI(struct _glapi_table *disp) {
+static inline _glptr_GetTexBumpParameterivATI GET_GetTexBumpParameterivATI(struct _glapi_table *disp) {
    return (_glptr_GetTexBumpParameterivATI) (GET_by_offset(disp, _gloffset_GetTexBumpParameterivATI));
 }
 
-static INLINE void SET_GetTexBumpParameterivATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) {
+static inline void SET_GetTexBumpParameterivATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTexBumpParameterivATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexBumpParameterfvATI)(GLenum, const GLfloat *);
 #define CALL_TexBumpParameterfvATI(disp, parameters) \
     (* GET_TexBumpParameterfvATI(disp)) parameters
-static INLINE _glptr_TexBumpParameterfvATI GET_TexBumpParameterfvATI(struct _glapi_table *disp) {
+static inline _glptr_TexBumpParameterfvATI GET_TexBumpParameterfvATI(struct _glapi_table *disp) {
    return (_glptr_TexBumpParameterfvATI) (GET_by_offset(disp, _gloffset_TexBumpParameterfvATI));
 }
 
-static INLINE void SET_TexBumpParameterfvATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+static inline void SET_TexBumpParameterfvATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_TexBumpParameterfvATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexBumpParameterivATI)(GLenum, const GLint *);
 #define CALL_TexBumpParameterivATI(disp, parameters) \
     (* GET_TexBumpParameterivATI(disp)) parameters
-static INLINE _glptr_TexBumpParameterivATI GET_TexBumpParameterivATI(struct _glapi_table *disp) {
+static inline _glptr_TexBumpParameterivATI GET_TexBumpParameterivATI(struct _glapi_table *disp) {
    return (_glptr_TexBumpParameterivATI) (GET_by_offset(disp, _gloffset_TexBumpParameterivATI));
 }
 
-static INLINE void SET_TexBumpParameterivATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_TexBumpParameterivATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_TexBumpParameterivATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp1ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_AlphaFragmentOp1ATI(disp, parameters) \
     (* GET_AlphaFragmentOp1ATI(disp)) parameters
-static INLINE _glptr_AlphaFragmentOp1ATI GET_AlphaFragmentOp1ATI(struct _glapi_table *disp) {
+static inline _glptr_AlphaFragmentOp1ATI GET_AlphaFragmentOp1ATI(struct _glapi_table *disp) {
    return (_glptr_AlphaFragmentOp1ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI));
 }
 
-static INLINE void SET_AlphaFragmentOp1ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_AlphaFragmentOp1ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp2ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_AlphaFragmentOp2ATI(disp, parameters) \
     (* GET_AlphaFragmentOp2ATI(disp)) parameters
-static INLINE _glptr_AlphaFragmentOp2ATI GET_AlphaFragmentOp2ATI(struct _glapi_table *disp) {
+static inline _glptr_AlphaFragmentOp2ATI GET_AlphaFragmentOp2ATI(struct _glapi_table *disp) {
    return (_glptr_AlphaFragmentOp2ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI));
 }
 
-static INLINE void SET_AlphaFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_AlphaFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_AlphaFragmentOp3ATI(disp, parameters) \
     (* GET_AlphaFragmentOp3ATI(disp)) parameters
-static INLINE _glptr_AlphaFragmentOp3ATI GET_AlphaFragmentOp3ATI(struct _glapi_table *disp) {
+static inline _glptr_AlphaFragmentOp3ATI GET_AlphaFragmentOp3ATI(struct _glapi_table *disp) {
    return (_glptr_AlphaFragmentOp3ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI));
 }
 
-static INLINE void SET_AlphaFragmentOp3ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_AlphaFragmentOp3ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BeginFragmentShaderATI)(void);
 #define CALL_BeginFragmentShaderATI(disp, parameters) \
     (* GET_BeginFragmentShaderATI(disp)) parameters
-static INLINE _glptr_BeginFragmentShaderATI GET_BeginFragmentShaderATI(struct _glapi_table *disp) {
+static inline _glptr_BeginFragmentShaderATI GET_BeginFragmentShaderATI(struct _glapi_table *disp) {
    return (_glptr_BeginFragmentShaderATI) (GET_by_offset(disp, _gloffset_BeginFragmentShaderATI));
 }
 
-static INLINE void SET_BeginFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_BeginFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_BeginFragmentShaderATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindFragmentShaderATI)(GLuint);
 #define CALL_BindFragmentShaderATI(disp, parameters) \
     (* GET_BindFragmentShaderATI(disp)) parameters
-static INLINE _glptr_BindFragmentShaderATI GET_BindFragmentShaderATI(struct _glapi_table *disp) {
+static inline _glptr_BindFragmentShaderATI GET_BindFragmentShaderATI(struct _glapi_table *disp) {
    return (_glptr_BindFragmentShaderATI) (GET_by_offset(disp, _gloffset_BindFragmentShaderATI));
 }
 
-static INLINE void SET_BindFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_BindFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_BindFragmentShaderATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorFragmentOp1ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_ColorFragmentOp1ATI(disp, parameters) \
     (* GET_ColorFragmentOp1ATI(disp)) parameters
-static INLINE _glptr_ColorFragmentOp1ATI GET_ColorFragmentOp1ATI(struct _glapi_table *disp) {
+static inline _glptr_ColorFragmentOp1ATI GET_ColorFragmentOp1ATI(struct _glapi_table *disp) {
    return (_glptr_ColorFragmentOp1ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp1ATI));
 }
 
-static INLINE void SET_ColorFragmentOp1ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_ColorFragmentOp1ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_ColorFragmentOp1ATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorFragmentOp2ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_ColorFragmentOp2ATI(disp, parameters) \
     (* GET_ColorFragmentOp2ATI(disp)) parameters
-static INLINE _glptr_ColorFragmentOp2ATI GET_ColorFragmentOp2ATI(struct _glapi_table *disp) {
+static inline _glptr_ColorFragmentOp2ATI GET_ColorFragmentOp2ATI(struct _glapi_table *disp) {
    return (_glptr_ColorFragmentOp2ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp2ATI));
 }
 
-static INLINE void SET_ColorFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_ColorFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_ColorFragmentOp2ATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_ColorFragmentOp3ATI(disp, parameters) \
     (* GET_ColorFragmentOp3ATI(disp)) parameters
-static INLINE _glptr_ColorFragmentOp3ATI GET_ColorFragmentOp3ATI(struct _glapi_table *disp) {
+static inline _glptr_ColorFragmentOp3ATI GET_ColorFragmentOp3ATI(struct _glapi_table *disp) {
    return (_glptr_ColorFragmentOp3ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp3ATI));
 }
 
-static INLINE void SET_ColorFragmentOp3ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_ColorFragmentOp3ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_ColorFragmentOp3ATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteFragmentShaderATI)(GLuint);
 #define CALL_DeleteFragmentShaderATI(disp, parameters) \
     (* GET_DeleteFragmentShaderATI(disp)) parameters
-static INLINE _glptr_DeleteFragmentShaderATI GET_DeleteFragmentShaderATI(struct _glapi_table *disp) {
+static inline _glptr_DeleteFragmentShaderATI GET_DeleteFragmentShaderATI(struct _glapi_table *disp) {
    return (_glptr_DeleteFragmentShaderATI) (GET_by_offset(disp, _gloffset_DeleteFragmentShaderATI));
 }
 
-static INLINE void SET_DeleteFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_DeleteFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_DeleteFragmentShaderATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EndFragmentShaderATI)(void);
 #define CALL_EndFragmentShaderATI(disp, parameters) \
     (* GET_EndFragmentShaderATI(disp)) parameters
-static INLINE _glptr_EndFragmentShaderATI GET_EndFragmentShaderATI(struct _glapi_table *disp) {
+static inline _glptr_EndFragmentShaderATI GET_EndFragmentShaderATI(struct _glapi_table *disp) {
    return (_glptr_EndFragmentShaderATI) (GET_by_offset(disp, _gloffset_EndFragmentShaderATI));
 }
 
-static INLINE void SET_EndFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_EndFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_EndFragmentShaderATI, fn);
 }
 
 typedef GLuint (GLAPIENTRYP _glptr_GenFragmentShadersATI)(GLuint);
 #define CALL_GenFragmentShadersATI(disp, parameters) \
     (* GET_GenFragmentShadersATI(disp)) parameters
-static INLINE _glptr_GenFragmentShadersATI GET_GenFragmentShadersATI(struct _glapi_table *disp) {
+static inline _glptr_GenFragmentShadersATI GET_GenFragmentShadersATI(struct _glapi_table *disp) {
    return (_glptr_GenFragmentShadersATI) (GET_by_offset(disp, _gloffset_GenFragmentShadersATI));
 }
 
-static INLINE void SET_GenFragmentShadersATI(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_GenFragmentShadersATI(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_GenFragmentShadersATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PassTexCoordATI)(GLuint, GLuint, GLenum);
 #define CALL_PassTexCoordATI(disp, parameters) \
     (* GET_PassTexCoordATI(disp)) parameters
-static INLINE _glptr_PassTexCoordATI GET_PassTexCoordATI(struct _glapi_table *disp) {
+static inline _glptr_PassTexCoordATI GET_PassTexCoordATI(struct _glapi_table *disp) {
    return (_glptr_PassTexCoordATI) (GET_by_offset(disp, _gloffset_PassTexCoordATI));
 }
 
-static INLINE void SET_PassTexCoordATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum)) {
+static inline void SET_PassTexCoordATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_PassTexCoordATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SampleMapATI)(GLuint, GLuint, GLenum);
 #define CALL_SampleMapATI(disp, parameters) \
     (* GET_SampleMapATI(disp)) parameters
-static INLINE _glptr_SampleMapATI GET_SampleMapATI(struct _glapi_table *disp) {
+static inline _glptr_SampleMapATI GET_SampleMapATI(struct _glapi_table *disp) {
    return (_glptr_SampleMapATI) (GET_by_offset(disp, _gloffset_SampleMapATI));
 }
 
-static INLINE void SET_SampleMapATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum)) {
+static inline void SET_SampleMapATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_SampleMapATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_SetFragmentShaderConstantATI)(GLuint, const GLfloat *);
 #define CALL_SetFragmentShaderConstantATI(disp, parameters) \
     (* GET_SetFragmentShaderConstantATI(disp)) parameters
-static INLINE _glptr_SetFragmentShaderConstantATI GET_SetFragmentShaderConstantATI(struct _glapi_table *disp) {
+static inline _glptr_SetFragmentShaderConstantATI GET_SetFragmentShaderConstantATI(struct _glapi_table *disp) {
    return (_glptr_SetFragmentShaderConstantATI) (GET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI));
 }
 
-static INLINE void SET_SetFragmentShaderConstantATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+static inline void SET_SetFragmentShaderConstantATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PointParameteriNV)(GLenum, GLint);
 #define CALL_PointParameteriNV(disp, parameters) \
     (* GET_PointParameteriNV(disp)) parameters
-static INLINE _glptr_PointParameteriNV GET_PointParameteriNV(struct _glapi_table *disp) {
+static inline _glptr_PointParameteriNV GET_PointParameteriNV(struct _glapi_table *disp) {
    return (_glptr_PointParameteriNV) (GET_by_offset(disp, _gloffset_PointParameteriNV));
 }
 
-static INLINE void SET_PointParameteriNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+static inline void SET_PointParameteriNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_PointParameteriNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PointParameterivNV)(GLenum, const GLint *);
 #define CALL_PointParameterivNV(disp, parameters) \
     (* GET_PointParameterivNV(disp)) parameters
-static INLINE _glptr_PointParameterivNV GET_PointParameterivNV(struct _glapi_table *disp) {
+static inline _glptr_PointParameterivNV GET_PointParameterivNV(struct _glapi_table *disp) {
    return (_glptr_PointParameterivNV) (GET_by_offset(disp, _gloffset_PointParameterivNV));
 }
 
-static INLINE void SET_PointParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+static inline void SET_PointParameterivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_PointParameterivNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ActiveStencilFaceEXT)(GLenum);
 #define CALL_ActiveStencilFaceEXT(disp, parameters) \
     (* GET_ActiveStencilFaceEXT(disp)) parameters
-static INLINE _glptr_ActiveStencilFaceEXT GET_ActiveStencilFaceEXT(struct _glapi_table *disp) {
+static inline _glptr_ActiveStencilFaceEXT GET_ActiveStencilFaceEXT(struct _glapi_table *disp) {
    return (_glptr_ActiveStencilFaceEXT) (GET_by_offset(disp, _gloffset_ActiveStencilFaceEXT));
 }
 
-static INLINE void SET_ActiveStencilFaceEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ActiveStencilFaceEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ActiveStencilFaceEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindVertexArrayAPPLE)(GLuint);
 #define CALL_BindVertexArrayAPPLE(disp, parameters) \
     (* GET_BindVertexArrayAPPLE(disp)) parameters
-static INLINE _glptr_BindVertexArrayAPPLE GET_BindVertexArrayAPPLE(struct _glapi_table *disp) {
+static inline _glptr_BindVertexArrayAPPLE GET_BindVertexArrayAPPLE(struct _glapi_table *disp) {
    return (_glptr_BindVertexArrayAPPLE) (GET_by_offset(disp, _gloffset_BindVertexArrayAPPLE));
 }
 
-static INLINE void SET_BindVertexArrayAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_BindVertexArrayAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_BindVertexArrayAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteVertexArraysAPPLE)(GLsizei, const GLuint *);
 #define CALL_DeleteVertexArraysAPPLE(disp, parameters) \
     (* GET_DeleteVertexArraysAPPLE(disp)) parameters
-static INLINE _glptr_DeleteVertexArraysAPPLE GET_DeleteVertexArraysAPPLE(struct _glapi_table *disp) {
+static inline _glptr_DeleteVertexArraysAPPLE GET_DeleteVertexArraysAPPLE(struct _glapi_table *disp) {
    return (_glptr_DeleteVertexArraysAPPLE) (GET_by_offset(disp, _gloffset_DeleteVertexArraysAPPLE));
 }
 
-static INLINE void SET_DeleteVertexArraysAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteVertexArraysAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteVertexArraysAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenVertexArraysAPPLE)(GLsizei, GLuint *);
 #define CALL_GenVertexArraysAPPLE(disp, parameters) \
     (* GET_GenVertexArraysAPPLE(disp)) parameters
-static INLINE _glptr_GenVertexArraysAPPLE GET_GenVertexArraysAPPLE(struct _glapi_table *disp) {
+static inline _glptr_GenVertexArraysAPPLE GET_GenVertexArraysAPPLE(struct _glapi_table *disp) {
    return (_glptr_GenVertexArraysAPPLE) (GET_by_offset(disp, _gloffset_GenVertexArraysAPPLE));
 }
 
-static INLINE void SET_GenVertexArraysAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenVertexArraysAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenVertexArraysAPPLE, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsVertexArrayAPPLE)(GLuint);
 #define CALL_IsVertexArrayAPPLE(disp, parameters) \
     (* GET_IsVertexArrayAPPLE(disp)) parameters
-static INLINE _glptr_IsVertexArrayAPPLE GET_IsVertexArrayAPPLE(struct _glapi_table *disp) {
+static inline _glptr_IsVertexArrayAPPLE GET_IsVertexArrayAPPLE(struct _glapi_table *disp) {
    return (_glptr_IsVertexArrayAPPLE) (GET_by_offset(disp, _gloffset_IsVertexArrayAPPLE));
 }
 
-static INLINE void SET_IsVertexArrayAPPLE(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsVertexArrayAPPLE(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsVertexArrayAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterdvNV)(GLuint, GLsizei, const GLubyte *, GLdouble *);
 #define CALL_GetProgramNamedParameterdvNV(disp, parameters) \
     (* GET_GetProgramNamedParameterdvNV(disp)) parameters
-static INLINE _glptr_GetProgramNamedParameterdvNV GET_GetProgramNamedParameterdvNV(struct _glapi_table *disp) {
+static inline _glptr_GetProgramNamedParameterdvNV GET_GetProgramNamedParameterdvNV(struct _glapi_table *disp) {
    return (_glptr_GetProgramNamedParameterdvNV) (GET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV));
 }
 
-static INLINE void SET_GetProgramNamedParameterdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble *)) {
+static inline void SET_GetProgramNamedParameterdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble *)) {
    SET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterfvNV)(GLuint, GLsizei, const GLubyte *, GLfloat *);
 #define CALL_GetProgramNamedParameterfvNV(disp, parameters) \
     (* GET_GetProgramNamedParameterfvNV(disp)) parameters
-static INLINE _glptr_GetProgramNamedParameterfvNV GET_GetProgramNamedParameterfvNV(struct _glapi_table *disp) {
+static inline _glptr_GetProgramNamedParameterfvNV GET_GetProgramNamedParameterfvNV(struct _glapi_table *disp) {
    return (_glptr_GetProgramNamedParameterfvNV) (GET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV));
 }
 
-static INLINE void SET_GetProgramNamedParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat *)) {
+static inline void SET_GetProgramNamedParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat *)) {
    SET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dNV)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_ProgramNamedParameter4dNV(disp, parameters) \
     (* GET_ProgramNamedParameter4dNV(disp)) parameters
-static INLINE _glptr_ProgramNamedParameter4dNV GET_ProgramNamedParameter4dNV(struct _glapi_table *disp) {
+static inline _glptr_ProgramNamedParameter4dNV GET_ProgramNamedParameter4dNV(struct _glapi_table *disp) {
    return (_glptr_ProgramNamedParameter4dNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV));
 }
 
-static INLINE void SET_ProgramNamedParameter4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble)) {
+static inline void SET_ProgramNamedParameter4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble)) {
    SET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dvNV)(GLuint, GLsizei, const GLubyte *, const GLdouble *);
 #define CALL_ProgramNamedParameter4dvNV(disp, parameters) \
     (* GET_ProgramNamedParameter4dvNV(disp)) parameters
-static INLINE _glptr_ProgramNamedParameter4dvNV GET_ProgramNamedParameter4dvNV(struct _glapi_table *disp) {
+static inline _glptr_ProgramNamedParameter4dvNV GET_ProgramNamedParameter4dvNV(struct _glapi_table *disp) {
    return (_glptr_ProgramNamedParameter4dvNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV));
 }
 
-static INLINE void SET_ProgramNamedParameter4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, const GLdouble *)) {
+static inline void SET_ProgramNamedParameter4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, const GLdouble *)) {
    SET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fNV)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_ProgramNamedParameter4fNV(disp, parameters) \
     (* GET_ProgramNamedParameter4fNV(disp)) parameters
-static INLINE _glptr_ProgramNamedParameter4fNV GET_ProgramNamedParameter4fNV(struct _glapi_table *disp) {
+static inline _glptr_ProgramNamedParameter4fNV GET_ProgramNamedParameter4fNV(struct _glapi_table *disp) {
    return (_glptr_ProgramNamedParameter4fNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV));
 }
 
-static INLINE void SET_ProgramNamedParameter4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat)) {
+static inline void SET_ProgramNamedParameter4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat)) {
    SET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fvNV)(GLuint, GLsizei, const GLubyte *, const GLfloat *);
 #define CALL_ProgramNamedParameter4fvNV(disp, parameters) \
     (* GET_ProgramNamedParameter4fvNV(disp)) parameters
-static INLINE _glptr_ProgramNamedParameter4fvNV GET_ProgramNamedParameter4fvNV(struct _glapi_table *disp) {
+static inline _glptr_ProgramNamedParameter4fvNV GET_ProgramNamedParameter4fvNV(struct _glapi_table *disp) {
    return (_glptr_ProgramNamedParameter4fvNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV));
 }
 
-static INLINE void SET_ProgramNamedParameter4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, const GLfloat *)) {
+static inline void SET_ProgramNamedParameter4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PrimitiveRestartIndexNV)(GLuint);
 #define CALL_PrimitiveRestartIndexNV(disp, parameters) \
     (* GET_PrimitiveRestartIndexNV(disp)) parameters
-static INLINE _glptr_PrimitiveRestartIndexNV GET_PrimitiveRestartIndexNV(struct _glapi_table *disp) {
+static inline _glptr_PrimitiveRestartIndexNV GET_PrimitiveRestartIndexNV(struct _glapi_table *disp) {
    return (_glptr_PrimitiveRestartIndexNV) (GET_by_offset(disp, _gloffset_PrimitiveRestartIndexNV));
 }
 
-static INLINE void SET_PrimitiveRestartIndexNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_PrimitiveRestartIndexNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_PrimitiveRestartIndexNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_PrimitiveRestartNV)(void);
 #define CALL_PrimitiveRestartNV(disp, parameters) \
     (* GET_PrimitiveRestartNV(disp)) parameters
-static INLINE _glptr_PrimitiveRestartNV GET_PrimitiveRestartNV(struct _glapi_table *disp) {
+static inline _glptr_PrimitiveRestartNV GET_PrimitiveRestartNV(struct _glapi_table *disp) {
    return (_glptr_PrimitiveRestartNV) (GET_by_offset(disp, _gloffset_PrimitiveRestartNV));
 }
 
-static INLINE void SET_PrimitiveRestartNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_PrimitiveRestartNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_PrimitiveRestartNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DepthBoundsEXT)(GLclampd, GLclampd);
 #define CALL_DepthBoundsEXT(disp, parameters) \
     (* GET_DepthBoundsEXT(disp)) parameters
-static INLINE _glptr_DepthBoundsEXT GET_DepthBoundsEXT(struct _glapi_table *disp) {
+static inline _glptr_DepthBoundsEXT GET_DepthBoundsEXT(struct _glapi_table *disp) {
    return (_glptr_DepthBoundsEXT) (GET_by_offset(disp, _gloffset_DepthBoundsEXT));
 }
 
-static INLINE void SET_DepthBoundsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) {
+static inline void SET_DepthBoundsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) {
    SET_by_offset(disp, _gloffset_DepthBoundsEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateEXT)(GLenum, GLenum);
 #define CALL_BlendEquationSeparateEXT(disp, parameters) \
     (* GET_BlendEquationSeparateEXT(disp)) parameters
-static INLINE _glptr_BlendEquationSeparateEXT GET_BlendEquationSeparateEXT(struct _glapi_table *disp) {
+static inline _glptr_BlendEquationSeparateEXT GET_BlendEquationSeparateEXT(struct _glapi_table *disp) {
    return (_glptr_BlendEquationSeparateEXT) (GET_by_offset(disp, _gloffset_BlendEquationSeparateEXT));
 }
 
-static INLINE void SET_BlendEquationSeparateEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+static inline void SET_BlendEquationSeparateEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
    SET_by_offset(disp, _gloffset_BlendEquationSeparateEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindFramebufferEXT)(GLenum, GLuint);
 #define CALL_BindFramebufferEXT(disp, parameters) \
     (* GET_BindFramebufferEXT(disp)) parameters
-static INLINE _glptr_BindFramebufferEXT GET_BindFramebufferEXT(struct _glapi_table *disp) {
+static inline _glptr_BindFramebufferEXT GET_BindFramebufferEXT(struct _glapi_table *disp) {
    return (_glptr_BindFramebufferEXT) (GET_by_offset(disp, _gloffset_BindFramebufferEXT));
 }
 
-static INLINE void SET_BindFramebufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BindFramebufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BindFramebufferEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindRenderbufferEXT)(GLenum, GLuint);
 #define CALL_BindRenderbufferEXT(disp, parameters) \
     (* GET_BindRenderbufferEXT(disp)) parameters
-static INLINE _glptr_BindRenderbufferEXT GET_BindRenderbufferEXT(struct _glapi_table *disp) {
+static inline _glptr_BindRenderbufferEXT GET_BindRenderbufferEXT(struct _glapi_table *disp) {
    return (_glptr_BindRenderbufferEXT) (GET_by_offset(disp, _gloffset_BindRenderbufferEXT));
 }
 
-static INLINE void SET_BindRenderbufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_BindRenderbufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_BindRenderbufferEXT, fn);
 }
 
 typedef GLenum (GLAPIENTRYP _glptr_CheckFramebufferStatusEXT)(GLenum);
 #define CALL_CheckFramebufferStatusEXT(disp, parameters) \
     (* GET_CheckFramebufferStatusEXT(disp)) parameters
-static INLINE _glptr_CheckFramebufferStatusEXT GET_CheckFramebufferStatusEXT(struct _glapi_table *disp) {
+static inline _glptr_CheckFramebufferStatusEXT GET_CheckFramebufferStatusEXT(struct _glapi_table *disp) {
    return (_glptr_CheckFramebufferStatusEXT) (GET_by_offset(disp, _gloffset_CheckFramebufferStatusEXT));
 }
 
-static INLINE void SET_CheckFramebufferStatusEXT(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_CheckFramebufferStatusEXT(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_CheckFramebufferStatusEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteFramebuffersEXT)(GLsizei, const GLuint *);
 #define CALL_DeleteFramebuffersEXT(disp, parameters) \
     (* GET_DeleteFramebuffersEXT(disp)) parameters
-static INLINE _glptr_DeleteFramebuffersEXT GET_DeleteFramebuffersEXT(struct _glapi_table *disp) {
+static inline _glptr_DeleteFramebuffersEXT GET_DeleteFramebuffersEXT(struct _glapi_table *disp) {
    return (_glptr_DeleteFramebuffersEXT) (GET_by_offset(disp, _gloffset_DeleteFramebuffersEXT));
 }
 
-static INLINE void SET_DeleteFramebuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteFramebuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteFramebuffersEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DeleteRenderbuffersEXT)(GLsizei, const GLuint *);
 #define CALL_DeleteRenderbuffersEXT(disp, parameters) \
     (* GET_DeleteRenderbuffersEXT(disp)) parameters
-static INLINE _glptr_DeleteRenderbuffersEXT GET_DeleteRenderbuffersEXT(struct _glapi_table *disp) {
+static inline _glptr_DeleteRenderbuffersEXT GET_DeleteRenderbuffersEXT(struct _glapi_table *disp) {
    return (_glptr_DeleteRenderbuffersEXT) (GET_by_offset(disp, _gloffset_DeleteRenderbuffersEXT));
 }
 
-static INLINE void SET_DeleteRenderbuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+static inline void SET_DeleteRenderbuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_DeleteRenderbuffersEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferRenderbufferEXT)(GLenum, GLenum, GLenum, GLuint);
 #define CALL_FramebufferRenderbufferEXT(disp, parameters) \
     (* GET_FramebufferRenderbufferEXT(disp)) parameters
-static INLINE _glptr_FramebufferRenderbufferEXT GET_FramebufferRenderbufferEXT(struct _glapi_table *disp) {
+static inline _glptr_FramebufferRenderbufferEXT GET_FramebufferRenderbufferEXT(struct _glapi_table *disp) {
    return (_glptr_FramebufferRenderbufferEXT) (GET_by_offset(disp, _gloffset_FramebufferRenderbufferEXT));
 }
 
-static INLINE void SET_FramebufferRenderbufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint)) {
+static inline void SET_FramebufferRenderbufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_FramebufferRenderbufferEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTexture1DEXT)(GLenum, GLenum, GLenum, GLuint, GLint);
 #define CALL_FramebufferTexture1DEXT(disp, parameters) \
     (* GET_FramebufferTexture1DEXT(disp)) parameters
-static INLINE _glptr_FramebufferTexture1DEXT GET_FramebufferTexture1DEXT(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTexture1DEXT GET_FramebufferTexture1DEXT(struct _glapi_table *disp) {
    return (_glptr_FramebufferTexture1DEXT) (GET_by_offset(disp, _gloffset_FramebufferTexture1DEXT));
 }
 
-static INLINE void SET_FramebufferTexture1DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) {
+static inline void SET_FramebufferTexture1DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) {
    SET_by_offset(disp, _gloffset_FramebufferTexture1DEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTexture2DEXT)(GLenum, GLenum, GLenum, GLuint, GLint);
 #define CALL_FramebufferTexture2DEXT(disp, parameters) \
     (* GET_FramebufferTexture2DEXT(disp)) parameters
-static INLINE _glptr_FramebufferTexture2DEXT GET_FramebufferTexture2DEXT(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTexture2DEXT GET_FramebufferTexture2DEXT(struct _glapi_table *disp) {
    return (_glptr_FramebufferTexture2DEXT) (GET_by_offset(disp, _gloffset_FramebufferTexture2DEXT));
 }
 
-static INLINE void SET_FramebufferTexture2DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) {
+static inline void SET_FramebufferTexture2DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) {
    SET_by_offset(disp, _gloffset_FramebufferTexture2DEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTexture3DEXT)(GLenum, GLenum, GLenum, GLuint, GLint, GLint);
 #define CALL_FramebufferTexture3DEXT(disp, parameters) \
     (* GET_FramebufferTexture3DEXT(disp)) parameters
-static INLINE _glptr_FramebufferTexture3DEXT GET_FramebufferTexture3DEXT(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTexture3DEXT GET_FramebufferTexture3DEXT(struct _glapi_table *disp) {
    return (_glptr_FramebufferTexture3DEXT) (GET_by_offset(disp, _gloffset_FramebufferTexture3DEXT));
 }
 
-static INLINE void SET_FramebufferTexture3DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint, GLint)) {
+static inline void SET_FramebufferTexture3DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_FramebufferTexture3DEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenFramebuffersEXT)(GLsizei, GLuint *);
 #define CALL_GenFramebuffersEXT(disp, parameters) \
     (* GET_GenFramebuffersEXT(disp)) parameters
-static INLINE _glptr_GenFramebuffersEXT GET_GenFramebuffersEXT(struct _glapi_table *disp) {
+static inline _glptr_GenFramebuffersEXT GET_GenFramebuffersEXT(struct _glapi_table *disp) {
    return (_glptr_GenFramebuffersEXT) (GET_by_offset(disp, _gloffset_GenFramebuffersEXT));
 }
 
-static INLINE void SET_GenFramebuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenFramebuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenFramebuffersEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenRenderbuffersEXT)(GLsizei, GLuint *);
 #define CALL_GenRenderbuffersEXT(disp, parameters) \
     (* GET_GenRenderbuffersEXT(disp)) parameters
-static INLINE _glptr_GenRenderbuffersEXT GET_GenRenderbuffersEXT(struct _glapi_table *disp) {
+static inline _glptr_GenRenderbuffersEXT GET_GenRenderbuffersEXT(struct _glapi_table *disp) {
    return (_glptr_GenRenderbuffersEXT) (GET_by_offset(disp, _gloffset_GenRenderbuffersEXT));
 }
 
-static INLINE void SET_GenRenderbuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+static inline void SET_GenRenderbuffersEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
    SET_by_offset(disp, _gloffset_GenRenderbuffersEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GenerateMipmapEXT)(GLenum);
 #define CALL_GenerateMipmapEXT(disp, parameters) \
     (* GET_GenerateMipmapEXT(disp)) parameters
-static INLINE _glptr_GenerateMipmapEXT GET_GenerateMipmapEXT(struct _glapi_table *disp) {
+static inline _glptr_GenerateMipmapEXT GET_GenerateMipmapEXT(struct _glapi_table *disp) {
    return (_glptr_GenerateMipmapEXT) (GET_by_offset(disp, _gloffset_GenerateMipmapEXT));
 }
 
-static INLINE void SET_GenerateMipmapEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_GenerateMipmapEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_GenerateMipmapEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetFramebufferAttachmentParameterivEXT)(GLenum, GLenum, GLenum, GLint *);
 #define CALL_GetFramebufferAttachmentParameterivEXT(disp, parameters) \
     (* GET_GetFramebufferAttachmentParameterivEXT(disp)) parameters
-static INLINE _glptr_GetFramebufferAttachmentParameterivEXT GET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetFramebufferAttachmentParameterivEXT GET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp) {
    return (_glptr_GetFramebufferAttachmentParameterivEXT) (GET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameterivEXT));
 }
 
-static INLINE void SET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLint *)) {
+static inline void SET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameterivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetRenderbufferParameterivEXT)(GLenum, GLenum, GLint *);
 #define CALL_GetRenderbufferParameterivEXT(disp, parameters) \
     (* GET_GetRenderbufferParameterivEXT(disp)) parameters
-static INLINE _glptr_GetRenderbufferParameterivEXT GET_GetRenderbufferParameterivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetRenderbufferParameterivEXT GET_GetRenderbufferParameterivEXT(struct _glapi_table *disp) {
    return (_glptr_GetRenderbufferParameterivEXT) (GET_by_offset(disp, _gloffset_GetRenderbufferParameterivEXT));
 }
 
-static INLINE void SET_GetRenderbufferParameterivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetRenderbufferParameterivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetRenderbufferParameterivEXT, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsFramebufferEXT)(GLuint);
 #define CALL_IsFramebufferEXT(disp, parameters) \
     (* GET_IsFramebufferEXT(disp)) parameters
-static INLINE _glptr_IsFramebufferEXT GET_IsFramebufferEXT(struct _glapi_table *disp) {
+static inline _glptr_IsFramebufferEXT GET_IsFramebufferEXT(struct _glapi_table *disp) {
    return (_glptr_IsFramebufferEXT) (GET_by_offset(disp, _gloffset_IsFramebufferEXT));
 }
 
-static INLINE void SET_IsFramebufferEXT(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsFramebufferEXT(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsFramebufferEXT, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsRenderbufferEXT)(GLuint);
 #define CALL_IsRenderbufferEXT(disp, parameters) \
     (* GET_IsRenderbufferEXT(disp)) parameters
-static INLINE _glptr_IsRenderbufferEXT GET_IsRenderbufferEXT(struct _glapi_table *disp) {
+static inline _glptr_IsRenderbufferEXT GET_IsRenderbufferEXT(struct _glapi_table *disp) {
    return (_glptr_IsRenderbufferEXT) (GET_by_offset(disp, _gloffset_IsRenderbufferEXT));
 }
 
-static INLINE void SET_IsRenderbufferEXT(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_IsRenderbufferEXT(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_IsRenderbufferEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_RenderbufferStorageEXT)(GLenum, GLenum, GLsizei, GLsizei);
 #define CALL_RenderbufferStorageEXT(disp, parameters) \
     (* GET_RenderbufferStorageEXT(disp)) parameters
-static INLINE _glptr_RenderbufferStorageEXT GET_RenderbufferStorageEXT(struct _glapi_table *disp) {
+static inline _glptr_RenderbufferStorageEXT GET_RenderbufferStorageEXT(struct _glapi_table *disp) {
    return (_glptr_RenderbufferStorageEXT) (GET_by_offset(disp, _gloffset_RenderbufferStorageEXT));
 }
 
-static INLINE void SET_RenderbufferStorageEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei)) {
+static inline void SET_RenderbufferStorageEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei)) {
    SET_by_offset(disp, _gloffset_RenderbufferStorageEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BlitFramebufferEXT)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
 #define CALL_BlitFramebufferEXT(disp, parameters) \
     (* GET_BlitFramebufferEXT(disp)) parameters
-static INLINE _glptr_BlitFramebufferEXT GET_BlitFramebufferEXT(struct _glapi_table *disp) {
+static inline _glptr_BlitFramebufferEXT GET_BlitFramebufferEXT(struct _glapi_table *disp) {
    return (_glptr_BlitFramebufferEXT) (GET_by_offset(disp, _gloffset_BlitFramebufferEXT));
 }
 
-static INLINE void SET_BlitFramebufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)) {
+static inline void SET_BlitFramebufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)) {
    SET_by_offset(disp, _gloffset_BlitFramebufferEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BufferParameteriAPPLE)(GLenum, GLenum, GLint);
 #define CALL_BufferParameteriAPPLE(disp, parameters) \
     (* GET_BufferParameteriAPPLE(disp)) parameters
-static INLINE _glptr_BufferParameteriAPPLE GET_BufferParameteriAPPLE(struct _glapi_table *disp) {
+static inline _glptr_BufferParameteriAPPLE GET_BufferParameteriAPPLE(struct _glapi_table *disp) {
    return (_glptr_BufferParameteriAPPLE) (GET_by_offset(disp, _gloffset_BufferParameteriAPPLE));
 }
 
-static INLINE void SET_BufferParameteriAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+static inline void SET_BufferParameteriAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
    SET_by_offset(disp, _gloffset_BufferParameteriAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRangeAPPLE)(GLenum, GLintptr, GLsizeiptr);
 #define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) \
     (* GET_FlushMappedBufferRangeAPPLE(disp)) parameters
-static INLINE _glptr_FlushMappedBufferRangeAPPLE GET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp) {
+static inline _glptr_FlushMappedBufferRangeAPPLE GET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp) {
    return (_glptr_FlushMappedBufferRangeAPPLE) (GET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE));
 }
 
-static INLINE void SET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) {
+static inline void SET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) {
    SET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindFragDataLocationEXT)(GLuint, GLuint, const GLchar *);
 #define CALL_BindFragDataLocationEXT(disp, parameters) \
     (* GET_BindFragDataLocationEXT(disp)) parameters
-static INLINE _glptr_BindFragDataLocationEXT GET_BindFragDataLocationEXT(struct _glapi_table *disp) {
+static inline _glptr_BindFragDataLocationEXT GET_BindFragDataLocationEXT(struct _glapi_table *disp) {
    return (_glptr_BindFragDataLocationEXT) (GET_by_offset(disp, _gloffset_BindFragDataLocationEXT));
 }
 
-static INLINE void SET_BindFragDataLocationEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) {
+static inline void SET_BindFragDataLocationEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) {
    SET_by_offset(disp, _gloffset_BindFragDataLocationEXT, fn);
 }
 
 typedef GLint (GLAPIENTRYP _glptr_GetFragDataLocationEXT)(GLuint, const GLchar *);
 #define CALL_GetFragDataLocationEXT(disp, parameters) \
     (* GET_GetFragDataLocationEXT(disp)) parameters
-static INLINE _glptr_GetFragDataLocationEXT GET_GetFragDataLocationEXT(struct _glapi_table *disp) {
+static inline _glptr_GetFragDataLocationEXT GET_GetFragDataLocationEXT(struct _glapi_table *disp) {
    return (_glptr_GetFragDataLocationEXT) (GET_by_offset(disp, _gloffset_GetFragDataLocationEXT));
 }
 
-static INLINE void SET_GetFragDataLocationEXT(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+static inline void SET_GetFragDataLocationEXT(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
    SET_by_offset(disp, _gloffset_GetFragDataLocationEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetUniformuivEXT)(GLuint, GLint, GLuint *);
 #define CALL_GetUniformuivEXT(disp, parameters) \
     (* GET_GetUniformuivEXT(disp)) parameters
-static INLINE _glptr_GetUniformuivEXT GET_GetUniformuivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetUniformuivEXT GET_GetUniformuivEXT(struct _glapi_table *disp) {
    return (_glptr_GetUniformuivEXT) (GET_by_offset(disp, _gloffset_GetUniformuivEXT));
 }
 
-static INLINE void SET_GetUniformuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint *)) {
+static inline void SET_GetUniformuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetUniformuivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribIivEXT)(GLuint, GLenum, GLint *);
 #define CALL_GetVertexAttribIivEXT(disp, parameters) \
     (* GET_GetVertexAttribIivEXT(disp)) parameters
-static INLINE _glptr_GetVertexAttribIivEXT GET_GetVertexAttribIivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribIivEXT GET_GetVertexAttribIivEXT(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribIivEXT) (GET_by_offset(disp, _gloffset_GetVertexAttribIivEXT));
 }
 
-static INLINE void SET_GetVertexAttribIivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+static inline void SET_GetVertexAttribIivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribIivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetVertexAttribIuivEXT)(GLuint, GLenum, GLuint *);
 #define CALL_GetVertexAttribIuivEXT(disp, parameters) \
     (* GET_GetVertexAttribIuivEXT(disp)) parameters
-static INLINE _glptr_GetVertexAttribIuivEXT GET_GetVertexAttribIuivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetVertexAttribIuivEXT GET_GetVertexAttribIuivEXT(struct _glapi_table *disp) {
    return (_glptr_GetVertexAttribIuivEXT) (GET_by_offset(disp, _gloffset_GetVertexAttribIuivEXT));
 }
 
-static INLINE void SET_GetVertexAttribIuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
+static inline void SET_GetVertexAttribIuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetVertexAttribIuivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform1uiEXT)(GLint, GLuint);
 #define CALL_Uniform1uiEXT(disp, parameters) \
     (* GET_Uniform1uiEXT(disp)) parameters
-static INLINE _glptr_Uniform1uiEXT GET_Uniform1uiEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform1uiEXT GET_Uniform1uiEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform1uiEXT) (GET_by_offset(disp, _gloffset_Uniform1uiEXT));
 }
 
-static INLINE void SET_Uniform1uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint)) {
+static inline void SET_Uniform1uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint)) {
    SET_by_offset(disp, _gloffset_Uniform1uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform1uivEXT)(GLint, GLsizei, const GLuint *);
 #define CALL_Uniform1uivEXT(disp, parameters) \
     (* GET_Uniform1uivEXT(disp)) parameters
-static INLINE _glptr_Uniform1uivEXT GET_Uniform1uivEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform1uivEXT GET_Uniform1uivEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform1uivEXT) (GET_by_offset(disp, _gloffset_Uniform1uivEXT));
 }
 
-static INLINE void SET_Uniform1uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+static inline void SET_Uniform1uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_Uniform1uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform2uiEXT)(GLint, GLuint, GLuint);
 #define CALL_Uniform2uiEXT(disp, parameters) \
     (* GET_Uniform2uiEXT(disp)) parameters
-static INLINE _glptr_Uniform2uiEXT GET_Uniform2uiEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform2uiEXT GET_Uniform2uiEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform2uiEXT) (GET_by_offset(disp, _gloffset_Uniform2uiEXT));
 }
 
-static INLINE void SET_Uniform2uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint)) {
+static inline void SET_Uniform2uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_Uniform2uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform2uivEXT)(GLint, GLsizei, const GLuint *);
 #define CALL_Uniform2uivEXT(disp, parameters) \
     (* GET_Uniform2uivEXT(disp)) parameters
-static INLINE _glptr_Uniform2uivEXT GET_Uniform2uivEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform2uivEXT GET_Uniform2uivEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform2uivEXT) (GET_by_offset(disp, _gloffset_Uniform2uivEXT));
 }
 
-static INLINE void SET_Uniform2uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+static inline void SET_Uniform2uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_Uniform2uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform3uiEXT)(GLint, GLuint, GLuint, GLuint);
 #define CALL_Uniform3uiEXT(disp, parameters) \
     (* GET_Uniform3uiEXT(disp)) parameters
-static INLINE _glptr_Uniform3uiEXT GET_Uniform3uiEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform3uiEXT GET_Uniform3uiEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform3uiEXT) (GET_by_offset(disp, _gloffset_Uniform3uiEXT));
 }
 
-static INLINE void SET_Uniform3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint)) {
+static inline void SET_Uniform3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_Uniform3uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform3uivEXT)(GLint, GLsizei, const GLuint *);
 #define CALL_Uniform3uivEXT(disp, parameters) \
     (* GET_Uniform3uivEXT(disp)) parameters
-static INLINE _glptr_Uniform3uivEXT GET_Uniform3uivEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform3uivEXT GET_Uniform3uivEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform3uivEXT) (GET_by_offset(disp, _gloffset_Uniform3uivEXT));
 }
 
-static INLINE void SET_Uniform3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+static inline void SET_Uniform3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_Uniform3uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform4uiEXT)(GLint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_Uniform4uiEXT(disp, parameters) \
     (* GET_Uniform4uiEXT(disp)) parameters
-static INLINE _glptr_Uniform4uiEXT GET_Uniform4uiEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform4uiEXT GET_Uniform4uiEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform4uiEXT) (GET_by_offset(disp, _gloffset_Uniform4uiEXT));
 }
 
-static INLINE void SET_Uniform4uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_Uniform4uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_Uniform4uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_Uniform4uivEXT)(GLint, GLsizei, const GLuint *);
 #define CALL_Uniform4uivEXT(disp, parameters) \
     (* GET_Uniform4uivEXT(disp)) parameters
-static INLINE _glptr_Uniform4uivEXT GET_Uniform4uivEXT(struct _glapi_table *disp) {
+static inline _glptr_Uniform4uivEXT GET_Uniform4uivEXT(struct _glapi_table *disp) {
    return (_glptr_Uniform4uivEXT) (GET_by_offset(disp, _gloffset_Uniform4uivEXT));
 }
 
-static INLINE void SET_Uniform4uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+static inline void SET_Uniform4uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
    SET_by_offset(disp, _gloffset_Uniform4uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI1iEXT)(GLuint, GLint);
 #define CALL_VertexAttribI1iEXT(disp, parameters) \
     (* GET_VertexAttribI1iEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI1iEXT GET_VertexAttribI1iEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI1iEXT GET_VertexAttribI1iEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI1iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1iEXT));
 }
 
-static INLINE void SET_VertexAttribI1iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint)) {
+static inline void SET_VertexAttribI1iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI1iEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI1ivEXT)(GLuint, const GLint *);
 #define CALL_VertexAttribI1ivEXT(disp, parameters) \
     (* GET_VertexAttribI1ivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI1ivEXT GET_VertexAttribI1ivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI1ivEXT GET_VertexAttribI1ivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI1ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1ivEXT));
 }
 
-static INLINE void SET_VertexAttribI1ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+static inline void SET_VertexAttribI1ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI1ivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiEXT)(GLuint, GLuint);
 #define CALL_VertexAttribI1uiEXT(disp, parameters) \
     (* GET_VertexAttribI1uiEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI1uiEXT GET_VertexAttribI1uiEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI1uiEXT GET_VertexAttribI1uiEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI1uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1uiEXT));
 }
 
-static INLINE void SET_VertexAttribI1uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+static inline void SET_VertexAttribI1uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI1uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI1uivEXT)(GLuint, const GLuint *);
 #define CALL_VertexAttribI1uivEXT(disp, parameters) \
     (* GET_VertexAttribI1uivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI1uivEXT GET_VertexAttribI1uivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI1uivEXT GET_VertexAttribI1uivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI1uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1uivEXT));
 }
 
-static INLINE void SET_VertexAttribI1uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+static inline void SET_VertexAttribI1uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI1uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI2iEXT)(GLuint, GLint, GLint);
 #define CALL_VertexAttribI2iEXT(disp, parameters) \
     (* GET_VertexAttribI2iEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI2iEXT GET_VertexAttribI2iEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI2iEXT GET_VertexAttribI2iEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI2iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2iEXT));
 }
 
-static INLINE void SET_VertexAttribI2iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint)) {
+static inline void SET_VertexAttribI2iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI2iEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI2ivEXT)(GLuint, const GLint *);
 #define CALL_VertexAttribI2ivEXT(disp, parameters) \
     (* GET_VertexAttribI2ivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI2ivEXT GET_VertexAttribI2ivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI2ivEXT GET_VertexAttribI2ivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI2ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2ivEXT));
 }
 
-static INLINE void SET_VertexAttribI2ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+static inline void SET_VertexAttribI2ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI2ivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI2uiEXT)(GLuint, GLuint, GLuint);
 #define CALL_VertexAttribI2uiEXT(disp, parameters) \
     (* GET_VertexAttribI2uiEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI2uiEXT GET_VertexAttribI2uiEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI2uiEXT GET_VertexAttribI2uiEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI2uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2uiEXT));
 }
 
-static INLINE void SET_VertexAttribI2uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+static inline void SET_VertexAttribI2uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI2uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI2uivEXT)(GLuint, const GLuint *);
 #define CALL_VertexAttribI2uivEXT(disp, parameters) \
     (* GET_VertexAttribI2uivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI2uivEXT GET_VertexAttribI2uivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI2uivEXT GET_VertexAttribI2uivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI2uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2uivEXT));
 }
 
-static INLINE void SET_VertexAttribI2uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+static inline void SET_VertexAttribI2uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI2uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI3iEXT)(GLuint, GLint, GLint, GLint);
 #define CALL_VertexAttribI3iEXT(disp, parameters) \
     (* GET_VertexAttribI3iEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI3iEXT GET_VertexAttribI3iEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI3iEXT GET_VertexAttribI3iEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI3iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3iEXT));
 }
 
-static INLINE void SET_VertexAttribI3iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint)) {
+static inline void SET_VertexAttribI3iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI3iEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI3ivEXT)(GLuint, const GLint *);
 #define CALL_VertexAttribI3ivEXT(disp, parameters) \
     (* GET_VertexAttribI3ivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI3ivEXT GET_VertexAttribI3ivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI3ivEXT GET_VertexAttribI3ivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI3ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3ivEXT));
 }
 
-static INLINE void SET_VertexAttribI3ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+static inline void SET_VertexAttribI3ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI3ivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI3uiEXT)(GLuint, GLuint, GLuint, GLuint);
 #define CALL_VertexAttribI3uiEXT(disp, parameters) \
     (* GET_VertexAttribI3uiEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI3uiEXT GET_VertexAttribI3uiEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI3uiEXT GET_VertexAttribI3uiEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI3uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3uiEXT));
 }
 
-static INLINE void SET_VertexAttribI3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_VertexAttribI3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI3uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI3uivEXT)(GLuint, const GLuint *);
 #define CALL_VertexAttribI3uivEXT(disp, parameters) \
     (* GET_VertexAttribI3uivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI3uivEXT GET_VertexAttribI3uivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI3uivEXT GET_VertexAttribI3uivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI3uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3uivEXT));
 }
 
-static INLINE void SET_VertexAttribI3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+static inline void SET_VertexAttribI3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI3uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4bvEXT)(GLuint, const GLbyte *);
 #define CALL_VertexAttribI4bvEXT(disp, parameters) \
     (* GET_VertexAttribI4bvEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4bvEXT GET_VertexAttribI4bvEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4bvEXT GET_VertexAttribI4bvEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4bvEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4bvEXT));
 }
 
-static INLINE void SET_VertexAttribI4bvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
+static inline void SET_VertexAttribI4bvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4bvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4iEXT)(GLuint, GLint, GLint, GLint, GLint);
 #define CALL_VertexAttribI4iEXT(disp, parameters) \
     (* GET_VertexAttribI4iEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4iEXT GET_VertexAttribI4iEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4iEXT GET_VertexAttribI4iEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4iEXT));
 }
 
-static INLINE void SET_VertexAttribI4iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint)) {
+static inline void SET_VertexAttribI4iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4iEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4ivEXT)(GLuint, const GLint *);
 #define CALL_VertexAttribI4ivEXT(disp, parameters) \
     (* GET_VertexAttribI4ivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4ivEXT GET_VertexAttribI4ivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4ivEXT GET_VertexAttribI4ivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4ivEXT));
 }
 
-static INLINE void SET_VertexAttribI4ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+static inline void SET_VertexAttribI4ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4ivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4svEXT)(GLuint, const GLshort *);
 #define CALL_VertexAttribI4svEXT(disp, parameters) \
     (* GET_VertexAttribI4svEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4svEXT GET_VertexAttribI4svEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4svEXT GET_VertexAttribI4svEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4svEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4svEXT));
 }
 
-static INLINE void SET_VertexAttribI4svEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+static inline void SET_VertexAttribI4svEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4svEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4ubvEXT)(GLuint, const GLubyte *);
 #define CALL_VertexAttribI4ubvEXT(disp, parameters) \
     (* GET_VertexAttribI4ubvEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4ubvEXT GET_VertexAttribI4ubvEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4ubvEXT GET_VertexAttribI4ubvEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4ubvEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4ubvEXT));
 }
 
-static INLINE void SET_VertexAttribI4ubvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+static inline void SET_VertexAttribI4ubvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4ubvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4uiEXT)(GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_VertexAttribI4uiEXT(disp, parameters) \
     (* GET_VertexAttribI4uiEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4uiEXT GET_VertexAttribI4uiEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4uiEXT GET_VertexAttribI4uiEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4uiEXT));
 }
 
-static INLINE void SET_VertexAttribI4uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_VertexAttribI4uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4uiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4uivEXT)(GLuint, const GLuint *);
 #define CALL_VertexAttribI4uivEXT(disp, parameters) \
     (* GET_VertexAttribI4uivEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4uivEXT GET_VertexAttribI4uivEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4uivEXT GET_VertexAttribI4uivEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4uivEXT));
 }
 
-static INLINE void SET_VertexAttribI4uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+static inline void SET_VertexAttribI4uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4uivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribI4usvEXT)(GLuint, const GLushort *);
 #define CALL_VertexAttribI4usvEXT(disp, parameters) \
     (* GET_VertexAttribI4usvEXT(disp)) parameters
-static INLINE _glptr_VertexAttribI4usvEXT GET_VertexAttribI4usvEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribI4usvEXT GET_VertexAttribI4usvEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribI4usvEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4usvEXT));
 }
 
-static INLINE void SET_VertexAttribI4usvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
+static inline void SET_VertexAttribI4usvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
    SET_by_offset(disp, _gloffset_VertexAttribI4usvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_VertexAttribIPointerEXT)(GLuint, GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_VertexAttribIPointerEXT(disp, parameters) \
     (* GET_VertexAttribIPointerEXT(disp)) parameters
-static INLINE _glptr_VertexAttribIPointerEXT GET_VertexAttribIPointerEXT(struct _glapi_table *disp) {
+static inline _glptr_VertexAttribIPointerEXT GET_VertexAttribIPointerEXT(struct _glapi_table *disp) {
    return (_glptr_VertexAttribIPointerEXT) (GET_by_offset(disp, _gloffset_VertexAttribIPointerEXT));
 }
 
-static INLINE void SET_VertexAttribIPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) {
+static inline void SET_VertexAttribIPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) {
    SET_by_offset(disp, _gloffset_VertexAttribIPointerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_FramebufferTextureLayerEXT)(GLenum, GLenum, GLuint, GLint, GLint);
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) \
     (* GET_FramebufferTextureLayerEXT(disp)) parameters
-static INLINE _glptr_FramebufferTextureLayerEXT GET_FramebufferTextureLayerEXT(struct _glapi_table *disp) {
+static inline _glptr_FramebufferTextureLayerEXT GET_FramebufferTextureLayerEXT(struct _glapi_table *disp) {
    return (_glptr_FramebufferTextureLayerEXT) (GET_by_offset(disp, _gloffset_FramebufferTextureLayerEXT));
 }
 
-static INLINE void SET_FramebufferTextureLayerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLint)) {
+static inline void SET_FramebufferTextureLayerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_FramebufferTextureLayerEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ColorMaskIndexedEXT)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
 #define CALL_ColorMaskIndexedEXT(disp, parameters) \
     (* GET_ColorMaskIndexedEXT(disp)) parameters
-static INLINE _glptr_ColorMaskIndexedEXT GET_ColorMaskIndexedEXT(struct _glapi_table *disp) {
+static inline _glptr_ColorMaskIndexedEXT GET_ColorMaskIndexedEXT(struct _glapi_table *disp) {
    return (_glptr_ColorMaskIndexedEXT) (GET_by_offset(disp, _gloffset_ColorMaskIndexedEXT));
 }
 
-static INLINE void SET_ColorMaskIndexedEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean)) {
+static inline void SET_ColorMaskIndexedEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean)) {
    SET_by_offset(disp, _gloffset_ColorMaskIndexedEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_DisableIndexedEXT)(GLenum, GLuint);
 #define CALL_DisableIndexedEXT(disp, parameters) \
     (* GET_DisableIndexedEXT(disp)) parameters
-static INLINE _glptr_DisableIndexedEXT GET_DisableIndexedEXT(struct _glapi_table *disp) {
+static inline _glptr_DisableIndexedEXT GET_DisableIndexedEXT(struct _glapi_table *disp) {
    return (_glptr_DisableIndexedEXT) (GET_by_offset(disp, _gloffset_DisableIndexedEXT));
 }
 
-static INLINE void SET_DisableIndexedEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_DisableIndexedEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_DisableIndexedEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EnableIndexedEXT)(GLenum, GLuint);
 #define CALL_EnableIndexedEXT(disp, parameters) \
     (* GET_EnableIndexedEXT(disp)) parameters
-static INLINE _glptr_EnableIndexedEXT GET_EnableIndexedEXT(struct _glapi_table *disp) {
+static inline _glptr_EnableIndexedEXT GET_EnableIndexedEXT(struct _glapi_table *disp) {
    return (_glptr_EnableIndexedEXT) (GET_by_offset(disp, _gloffset_EnableIndexedEXT));
 }
 
-static INLINE void SET_EnableIndexedEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_EnableIndexedEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_EnableIndexedEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetBooleanIndexedvEXT)(GLenum, GLuint, GLboolean *);
 #define CALL_GetBooleanIndexedvEXT(disp, parameters) \
     (* GET_GetBooleanIndexedvEXT(disp)) parameters
-static INLINE _glptr_GetBooleanIndexedvEXT GET_GetBooleanIndexedvEXT(struct _glapi_table *disp) {
+static inline _glptr_GetBooleanIndexedvEXT GET_GetBooleanIndexedvEXT(struct _glapi_table *disp) {
    return (_glptr_GetBooleanIndexedvEXT) (GET_by_offset(disp, _gloffset_GetBooleanIndexedvEXT));
 }
 
-static INLINE void SET_GetBooleanIndexedvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLboolean *)) {
+static inline void SET_GetBooleanIndexedvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLboolean *)) {
    SET_by_offset(disp, _gloffset_GetBooleanIndexedvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetIntegerIndexedvEXT)(GLenum, GLuint, GLint *);
 #define CALL_GetIntegerIndexedvEXT(disp, parameters) \
     (* GET_GetIntegerIndexedvEXT(disp)) parameters
-static INLINE _glptr_GetIntegerIndexedvEXT GET_GetIntegerIndexedvEXT(struct _glapi_table *disp) {
+static inline _glptr_GetIntegerIndexedvEXT GET_GetIntegerIndexedvEXT(struct _glapi_table *disp) {
    return (_glptr_GetIntegerIndexedvEXT) (GET_by_offset(disp, _gloffset_GetIntegerIndexedvEXT));
 }
 
-static INLINE void SET_GetIntegerIndexedvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint *)) {
+static inline void SET_GetIntegerIndexedvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint *)) {
    SET_by_offset(disp, _gloffset_GetIntegerIndexedvEXT, fn);
 }
 
 typedef GLboolean (GLAPIENTRYP _glptr_IsEnabledIndexedEXT)(GLenum, GLuint);
 #define CALL_IsEnabledIndexedEXT(disp, parameters) \
     (* GET_IsEnabledIndexedEXT(disp)) parameters
-static INLINE _glptr_IsEnabledIndexedEXT GET_IsEnabledIndexedEXT(struct _glapi_table *disp) {
+static inline _glptr_IsEnabledIndexedEXT GET_IsEnabledIndexedEXT(struct _glapi_table *disp) {
    return (_glptr_IsEnabledIndexedEXT) (GET_by_offset(disp, _gloffset_IsEnabledIndexedEXT));
 }
 
-static INLINE void SET_IsEnabledIndexedEXT(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_IsEnabledIndexedEXT(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_IsEnabledIndexedEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearColorIiEXT)(GLint, GLint, GLint, GLint);
 #define CALL_ClearColorIiEXT(disp, parameters) \
     (* GET_ClearColorIiEXT(disp)) parameters
-static INLINE _glptr_ClearColorIiEXT GET_ClearColorIiEXT(struct _glapi_table *disp) {
+static inline _glptr_ClearColorIiEXT GET_ClearColorIiEXT(struct _glapi_table *disp) {
    return (_glptr_ClearColorIiEXT) (GET_by_offset(disp, _gloffset_ClearColorIiEXT));
 }
 
-static INLINE void SET_ClearColorIiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+static inline void SET_ClearColorIiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
    SET_by_offset(disp, _gloffset_ClearColorIiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ClearColorIuiEXT)(GLuint, GLuint, GLuint, GLuint);
 #define CALL_ClearColorIuiEXT(disp, parameters) \
     (* GET_ClearColorIuiEXT(disp)) parameters
-static INLINE _glptr_ClearColorIuiEXT GET_ClearColorIuiEXT(struct _glapi_table *disp) {
+static inline _glptr_ClearColorIuiEXT GET_ClearColorIuiEXT(struct _glapi_table *disp) {
    return (_glptr_ClearColorIuiEXT) (GET_by_offset(disp, _gloffset_ClearColorIuiEXT));
 }
 
-static INLINE void SET_ClearColorIuiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) {
+static inline void SET_ClearColorIuiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_ClearColorIuiEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexParameterIivEXT)(GLenum, GLenum, GLint *);
 #define CALL_GetTexParameterIivEXT(disp, parameters) \
     (* GET_GetTexParameterIivEXT(disp)) parameters
-static INLINE _glptr_GetTexParameterIivEXT GET_GetTexParameterIivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetTexParameterIivEXT GET_GetTexParameterIivEXT(struct _glapi_table *disp) {
    return (_glptr_GetTexParameterIivEXT) (GET_by_offset(disp, _gloffset_GetTexParameterIivEXT));
 }
 
-static INLINE void SET_GetTexParameterIivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+static inline void SET_GetTexParameterIivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetTexParameterIivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexParameterIuivEXT)(GLenum, GLenum, GLuint *);
 #define CALL_GetTexParameterIuivEXT(disp, parameters) \
     (* GET_GetTexParameterIuivEXT(disp)) parameters
-static INLINE _glptr_GetTexParameterIuivEXT GET_GetTexParameterIuivEXT(struct _glapi_table *disp) {
+static inline _glptr_GetTexParameterIuivEXT GET_GetTexParameterIuivEXT(struct _glapi_table *disp) {
    return (_glptr_GetTexParameterIuivEXT) (GET_by_offset(disp, _gloffset_GetTexParameterIuivEXT));
 }
 
-static INLINE void SET_GetTexParameterIuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint *)) {
+static inline void SET_GetTexParameterIuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint *)) {
    SET_by_offset(disp, _gloffset_GetTexParameterIuivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexParameterIivEXT)(GLenum, GLenum, const GLint *);
 #define CALL_TexParameterIivEXT(disp, parameters) \
     (* GET_TexParameterIivEXT(disp)) parameters
-static INLINE _glptr_TexParameterIivEXT GET_TexParameterIivEXT(struct _glapi_table *disp) {
+static inline _glptr_TexParameterIivEXT GET_TexParameterIivEXT(struct _glapi_table *disp) {
    return (_glptr_TexParameterIivEXT) (GET_by_offset(disp, _gloffset_TexParameterIivEXT));
 }
 
-static INLINE void SET_TexParameterIivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+static inline void SET_TexParameterIivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
    SET_by_offset(disp, _gloffset_TexParameterIivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TexParameterIuivEXT)(GLenum, GLenum, const GLuint *);
 #define CALL_TexParameterIuivEXT(disp, parameters) \
     (* GET_TexParameterIuivEXT(disp)) parameters
-static INLINE _glptr_TexParameterIuivEXT GET_TexParameterIuivEXT(struct _glapi_table *disp) {
+static inline _glptr_TexParameterIuivEXT GET_TexParameterIuivEXT(struct _glapi_table *disp) {
    return (_glptr_TexParameterIuivEXT) (GET_by_offset(disp, _gloffset_TexParameterIuivEXT));
 }
 
-static INLINE void SET_TexParameterIuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
+static inline void SET_TexParameterIuivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
    SET_by_offset(disp, _gloffset_TexParameterIuivEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BeginConditionalRenderNV)(GLuint, GLenum);
 #define CALL_BeginConditionalRenderNV(disp, parameters) \
     (* GET_BeginConditionalRenderNV(disp)) parameters
-static INLINE _glptr_BeginConditionalRenderNV GET_BeginConditionalRenderNV(struct _glapi_table *disp) {
+static inline _glptr_BeginConditionalRenderNV GET_BeginConditionalRenderNV(struct _glapi_table *disp) {
    return (_glptr_BeginConditionalRenderNV) (GET_by_offset(disp, _gloffset_BeginConditionalRenderNV));
 }
 
-static INLINE void SET_BeginConditionalRenderNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
+static inline void SET_BeginConditionalRenderNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_BeginConditionalRenderNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EndConditionalRenderNV)(void);
 #define CALL_EndConditionalRenderNV(disp, parameters) \
     (* GET_EndConditionalRenderNV(disp)) parameters
-static INLINE _glptr_EndConditionalRenderNV GET_EndConditionalRenderNV(struct _glapi_table *disp) {
+static inline _glptr_EndConditionalRenderNV GET_EndConditionalRenderNV(struct _glapi_table *disp) {
    return (_glptr_EndConditionalRenderNV) (GET_by_offset(disp, _gloffset_EndConditionalRenderNV));
 }
 
-static INLINE void SET_EndConditionalRenderNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_EndConditionalRenderNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_EndConditionalRenderNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BeginTransformFeedbackEXT)(GLenum);
 #define CALL_BeginTransformFeedbackEXT(disp, parameters) \
     (* GET_BeginTransformFeedbackEXT(disp)) parameters
-static INLINE _glptr_BeginTransformFeedbackEXT GET_BeginTransformFeedbackEXT(struct _glapi_table *disp) {
+static inline _glptr_BeginTransformFeedbackEXT GET_BeginTransformFeedbackEXT(struct _glapi_table *disp) {
    return (_glptr_BeginTransformFeedbackEXT) (GET_by_offset(disp, _gloffset_BeginTransformFeedbackEXT));
 }
 
-static INLINE void SET_BeginTransformFeedbackEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_BeginTransformFeedbackEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_BeginTransformFeedbackEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindBufferBaseEXT)(GLenum, GLuint, GLuint);
 #define CALL_BindBufferBaseEXT(disp, parameters) \
     (* GET_BindBufferBaseEXT(disp)) parameters
-static INLINE _glptr_BindBufferBaseEXT GET_BindBufferBaseEXT(struct _glapi_table *disp) {
+static inline _glptr_BindBufferBaseEXT GET_BindBufferBaseEXT(struct _glapi_table *disp) {
    return (_glptr_BindBufferBaseEXT) (GET_by_offset(disp, _gloffset_BindBufferBaseEXT));
 }
 
-static INLINE void SET_BindBufferBaseEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) {
+static inline void SET_BindBufferBaseEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) {
    SET_by_offset(disp, _gloffset_BindBufferBaseEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindBufferOffsetEXT)(GLenum, GLuint, GLuint, GLintptr);
 #define CALL_BindBufferOffsetEXT(disp, parameters) \
     (* GET_BindBufferOffsetEXT(disp)) parameters
-static INLINE _glptr_BindBufferOffsetEXT GET_BindBufferOffsetEXT(struct _glapi_table *disp) {
+static inline _glptr_BindBufferOffsetEXT GET_BindBufferOffsetEXT(struct _glapi_table *disp) {
    return (_glptr_BindBufferOffsetEXT) (GET_by_offset(disp, _gloffset_BindBufferOffsetEXT));
 }
 
-static INLINE void SET_BindBufferOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr)) {
+static inline void SET_BindBufferOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr)) {
    SET_by_offset(disp, _gloffset_BindBufferOffsetEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_BindBufferRangeEXT)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
 #define CALL_BindBufferRangeEXT(disp, parameters) \
     (* GET_BindBufferRangeEXT(disp)) parameters
-static INLINE _glptr_BindBufferRangeEXT GET_BindBufferRangeEXT(struct _glapi_table *disp) {
+static inline _glptr_BindBufferRangeEXT GET_BindBufferRangeEXT(struct _glapi_table *disp) {
    return (_glptr_BindBufferRangeEXT) (GET_by_offset(disp, _gloffset_BindBufferRangeEXT));
 }
 
-static INLINE void SET_BindBufferRangeEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr)) {
+static inline void SET_BindBufferRangeEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr)) {
    SET_by_offset(disp, _gloffset_BindBufferRangeEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EndTransformFeedbackEXT)(void);
 #define CALL_EndTransformFeedbackEXT(disp, parameters) \
     (* GET_EndTransformFeedbackEXT(disp)) parameters
-static INLINE _glptr_EndTransformFeedbackEXT GET_EndTransformFeedbackEXT(struct _glapi_table *disp) {
+static inline _glptr_EndTransformFeedbackEXT GET_EndTransformFeedbackEXT(struct _glapi_table *disp) {
    return (_glptr_EndTransformFeedbackEXT) (GET_by_offset(disp, _gloffset_EndTransformFeedbackEXT));
 }
 
-static INLINE void SET_EndTransformFeedbackEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_EndTransformFeedbackEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_EndTransformFeedbackEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTransformFeedbackVaryingEXT)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
 #define CALL_GetTransformFeedbackVaryingEXT(disp, parameters) \
     (* GET_GetTransformFeedbackVaryingEXT(disp)) parameters
-static INLINE _glptr_GetTransformFeedbackVaryingEXT GET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp) {
+static inline _glptr_GetTransformFeedbackVaryingEXT GET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp) {
    return (_glptr_GetTransformFeedbackVaryingEXT) (GET_by_offset(disp, _gloffset_GetTransformFeedbackVaryingEXT));
 }
 
-static INLINE void SET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)) {
+static inline void SET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)) {
    SET_by_offset(disp, _gloffset_GetTransformFeedbackVaryingEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TransformFeedbackVaryingsEXT)(GLuint, GLsizei, const char **, GLenum);
 #define CALL_TransformFeedbackVaryingsEXT(disp, parameters) \
     (* GET_TransformFeedbackVaryingsEXT(disp)) parameters
-static INLINE _glptr_TransformFeedbackVaryingsEXT GET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp) {
+static inline _glptr_TransformFeedbackVaryingsEXT GET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp) {
    return (_glptr_TransformFeedbackVaryingsEXT) (GET_by_offset(disp, _gloffset_TransformFeedbackVaryingsEXT));
 }
 
-static INLINE void SET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const char **, GLenum)) {
+static inline void SET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const char **, GLenum)) {
    SET_by_offset(disp, _gloffset_TransformFeedbackVaryingsEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProvokingVertexEXT)(GLenum);
 #define CALL_ProvokingVertexEXT(disp, parameters) \
     (* GET_ProvokingVertexEXT(disp)) parameters
-static INLINE _glptr_ProvokingVertexEXT GET_ProvokingVertexEXT(struct _glapi_table *disp) {
+static inline _glptr_ProvokingVertexEXT GET_ProvokingVertexEXT(struct _glapi_table *disp) {
    return (_glptr_ProvokingVertexEXT) (GET_by_offset(disp, _gloffset_ProvokingVertexEXT));
 }
 
-static INLINE void SET_ProvokingVertexEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+static inline void SET_ProvokingVertexEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
    SET_by_offset(disp, _gloffset_ProvokingVertexEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetTexParameterPointervAPPLE)(GLenum, GLenum, GLvoid **);
 #define CALL_GetTexParameterPointervAPPLE(disp, parameters) \
     (* GET_GetTexParameterPointervAPPLE(disp)) parameters
-static INLINE _glptr_GetTexParameterPointervAPPLE GET_GetTexParameterPointervAPPLE(struct _glapi_table *disp) {
+static inline _glptr_GetTexParameterPointervAPPLE GET_GetTexParameterPointervAPPLE(struct _glapi_table *disp) {
    return (_glptr_GetTexParameterPointervAPPLE) (GET_by_offset(disp, _gloffset_GetTexParameterPointervAPPLE));
 }
 
-static INLINE void SET_GetTexParameterPointervAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid **)) {
+static inline void SET_GetTexParameterPointervAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid **)) {
    SET_by_offset(disp, _gloffset_GetTexParameterPointervAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TextureRangeAPPLE)(GLenum, GLsizei, GLvoid *);
 #define CALL_TextureRangeAPPLE(disp, parameters) \
     (* GET_TextureRangeAPPLE(disp)) parameters
-static INLINE _glptr_TextureRangeAPPLE GET_TextureRangeAPPLE(struct _glapi_table *disp) {
+static inline _glptr_TextureRangeAPPLE GET_TextureRangeAPPLE(struct _glapi_table *disp) {
    return (_glptr_TextureRangeAPPLE) (GET_by_offset(disp, _gloffset_TextureRangeAPPLE));
 }
 
-static INLINE void SET_TextureRangeAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLvoid *)) {
+static inline void SET_TextureRangeAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLvoid *)) {
    SET_by_offset(disp, _gloffset_TextureRangeAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetObjectParameterivAPPLE)(GLenum, GLuint, GLenum, GLint *);
 #define CALL_GetObjectParameterivAPPLE(disp, parameters) \
     (* GET_GetObjectParameterivAPPLE(disp)) parameters
-static INLINE _glptr_GetObjectParameterivAPPLE GET_GetObjectParameterivAPPLE(struct _glapi_table *disp) {
+static inline _glptr_GetObjectParameterivAPPLE GET_GetObjectParameterivAPPLE(struct _glapi_table *disp) {
    return (_glptr_GetObjectParameterivAPPLE) (GET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE));
 }
 
-static INLINE void SET_GetObjectParameterivAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
+static inline void SET_GetObjectParameterivAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
    SET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE, fn);
 }
 
 typedef GLenum (GLAPIENTRYP _glptr_ObjectPurgeableAPPLE)(GLenum, GLuint, GLenum);
 #define CALL_ObjectPurgeableAPPLE(disp, parameters) \
     (* GET_ObjectPurgeableAPPLE(disp)) parameters
-static INLINE _glptr_ObjectPurgeableAPPLE GET_ObjectPurgeableAPPLE(struct _glapi_table *disp) {
+static inline _glptr_ObjectPurgeableAPPLE GET_ObjectPurgeableAPPLE(struct _glapi_table *disp) {
    return (_glptr_ObjectPurgeableAPPLE) (GET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE));
 }
 
-static INLINE void SET_ObjectPurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) {
+static inline void SET_ObjectPurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE, fn);
 }
 
 typedef GLenum (GLAPIENTRYP _glptr_ObjectUnpurgeableAPPLE)(GLenum, GLuint, GLenum);
 #define CALL_ObjectUnpurgeableAPPLE(disp, parameters) \
     (* GET_ObjectUnpurgeableAPPLE(disp)) parameters
-static INLINE _glptr_ObjectUnpurgeableAPPLE GET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp) {
+static inline _glptr_ObjectUnpurgeableAPPLE GET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp) {
    return (_glptr_ObjectUnpurgeableAPPLE) (GET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE));
 }
 
-static INLINE void SET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) {
+static inline void SET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) {
    SET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ActiveProgramEXT)(GLuint);
 #define CALL_ActiveProgramEXT(disp, parameters) \
     (* GET_ActiveProgramEXT(disp)) parameters
-static INLINE _glptr_ActiveProgramEXT GET_ActiveProgramEXT(struct _glapi_table *disp) {
+static inline _glptr_ActiveProgramEXT GET_ActiveProgramEXT(struct _glapi_table *disp) {
    return (_glptr_ActiveProgramEXT) (GET_by_offset(disp, _gloffset_ActiveProgramEXT));
 }
 
-static INLINE void SET_ActiveProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+static inline void SET_ActiveProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
    SET_by_offset(disp, _gloffset_ActiveProgramEXT, fn);
 }
 
 typedef GLuint (GLAPIENTRYP _glptr_CreateShaderProgramEXT)(GLenum, const GLchar *);
 #define CALL_CreateShaderProgramEXT(disp, parameters) \
     (* GET_CreateShaderProgramEXT(disp)) parameters
-static INLINE _glptr_CreateShaderProgramEXT GET_CreateShaderProgramEXT(struct _glapi_table *disp) {
+static inline _glptr_CreateShaderProgramEXT GET_CreateShaderProgramEXT(struct _glapi_table *disp) {
    return (_glptr_CreateShaderProgramEXT) (GET_by_offset(disp, _gloffset_CreateShaderProgramEXT));
 }
 
-static INLINE void SET_CreateShaderProgramEXT(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum, const GLchar *)) {
+static inline void SET_CreateShaderProgramEXT(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum, const GLchar *)) {
    SET_by_offset(disp, _gloffset_CreateShaderProgramEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_UseShaderProgramEXT)(GLenum, GLuint);
 #define CALL_UseShaderProgramEXT(disp, parameters) \
     (* GET_UseShaderProgramEXT(disp)) parameters
-static INLINE _glptr_UseShaderProgramEXT GET_UseShaderProgramEXT(struct _glapi_table *disp) {
+static inline _glptr_UseShaderProgramEXT GET_UseShaderProgramEXT(struct _glapi_table *disp) {
    return (_glptr_UseShaderProgramEXT) (GET_by_offset(disp, _gloffset_UseShaderProgramEXT));
 }
 
-static INLINE void SET_UseShaderProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+static inline void SET_UseShaderProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
    SET_by_offset(disp, _gloffset_UseShaderProgramEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_TextureBarrierNV)(void);
 #define CALL_TextureBarrierNV(disp, parameters) \
     (* GET_TextureBarrierNV(disp)) parameters
-static INLINE _glptr_TextureBarrierNV GET_TextureBarrierNV(struct _glapi_table *disp) {
+static inline _glptr_TextureBarrierNV GET_TextureBarrierNV(struct _glapi_table *disp) {
    return (_glptr_TextureBarrierNV) (GET_by_offset(disp, _gloffset_TextureBarrierNV));
 }
 
-static INLINE void SET_TextureBarrierNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+static inline void SET_TextureBarrierNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
    SET_by_offset(disp, _gloffset_TextureBarrierNV, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_StencilFuncSeparateATI)(GLenum, GLenum, GLint, GLuint);
 #define CALL_StencilFuncSeparateATI(disp, parameters) \
     (* GET_StencilFuncSeparateATI(disp)) parameters
-static INLINE _glptr_StencilFuncSeparateATI GET_StencilFuncSeparateATI(struct _glapi_table *disp) {
+static inline _glptr_StencilFuncSeparateATI GET_StencilFuncSeparateATI(struct _glapi_table *disp) {
    return (_glptr_StencilFuncSeparateATI) (GET_by_offset(disp, _gloffset_StencilFuncSeparateATI));
 }
 
-static INLINE void SET_StencilFuncSeparateATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLuint)) {
+static inline void SET_StencilFuncSeparateATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLuint)) {
    SET_by_offset(disp, _gloffset_StencilFuncSeparateATI, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramEnvParameters4fvEXT)(GLenum, GLuint, GLsizei, const GLfloat *);
 #define CALL_ProgramEnvParameters4fvEXT(disp, parameters) \
     (* GET_ProgramEnvParameters4fvEXT(disp)) parameters
-static INLINE _glptr_ProgramEnvParameters4fvEXT GET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp) {
+static inline _glptr_ProgramEnvParameters4fvEXT GET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp) {
    return (_glptr_ProgramEnvParameters4fvEXT) (GET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT));
 }
 
-static INLINE void SET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_ProgramLocalParameters4fvEXT)(GLenum, GLuint, GLsizei, const GLfloat *);
 #define CALL_ProgramLocalParameters4fvEXT(disp, parameters) \
     (* GET_ProgramLocalParameters4fvEXT(disp)) parameters
-static INLINE _glptr_ProgramLocalParameters4fvEXT GET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp) {
+static inline _glptr_ProgramLocalParameters4fvEXT GET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp) {
    return (_glptr_ProgramLocalParameters4fvEXT) (GET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT));
 }
 
-static INLINE void SET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
+static inline void SET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
    SET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetQueryObjecti64vEXT)(GLuint, GLenum, GLint64EXT *);
 #define CALL_GetQueryObjecti64vEXT(disp, parameters) \
     (* GET_GetQueryObjecti64vEXT(disp)) parameters
-static INLINE _glptr_GetQueryObjecti64vEXT GET_GetQueryObjecti64vEXT(struct _glapi_table *disp) {
+static inline _glptr_GetQueryObjecti64vEXT GET_GetQueryObjecti64vEXT(struct _glapi_table *disp) {
    return (_glptr_GetQueryObjecti64vEXT) (GET_by_offset(disp, _gloffset_GetQueryObjecti64vEXT));
 }
 
-static INLINE void SET_GetQueryObjecti64vEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint64EXT *)) {
+static inline void SET_GetQueryObjecti64vEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint64EXT *)) {
    SET_by_offset(disp, _gloffset_GetQueryObjecti64vEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_GetQueryObjectui64vEXT)(GLuint, GLenum, GLuint64EXT *);
 #define CALL_GetQueryObjectui64vEXT(disp, parameters) \
     (* GET_GetQueryObjectui64vEXT(disp)) parameters
-static INLINE _glptr_GetQueryObjectui64vEXT GET_GetQueryObjectui64vEXT(struct _glapi_table *disp) {
+static inline _glptr_GetQueryObjectui64vEXT GET_GetQueryObjectui64vEXT(struct _glapi_table *disp) {
    return (_glptr_GetQueryObjectui64vEXT) (GET_by_offset(disp, _gloffset_GetQueryObjectui64vEXT));
 }
 
-static INLINE void SET_GetQueryObjectui64vEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint64EXT *)) {
+static inline void SET_GetQueryObjectui64vEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint64EXT *)) {
    SET_by_offset(disp, _gloffset_GetQueryObjectui64vEXT, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EGLImageTargetRenderbufferStorageOES)(GLenum, GLvoid *);
 #define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) \
     (* GET_EGLImageTargetRenderbufferStorageOES(disp)) parameters
-static INLINE _glptr_EGLImageTargetRenderbufferStorageOES GET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp) {
+static inline _glptr_EGLImageTargetRenderbufferStorageOES GET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp) {
    return (_glptr_EGLImageTargetRenderbufferStorageOES) (GET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES));
 }
 
-static INLINE void SET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) {
+static inline void SET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES, fn);
 }
 
 typedef void (GLAPIENTRYP _glptr_EGLImageTargetTexture2DOES)(GLenum, GLvoid *);
 #define CALL_EGLImageTargetTexture2DOES(disp, parameters) \
     (* GET_EGLImageTargetTexture2DOES(disp)) parameters
-static INLINE _glptr_EGLImageTargetTexture2DOES GET_EGLImageTargetTexture2DOES(struct _glapi_table *disp) {
+static inline _glptr_EGLImageTargetTexture2DOES GET_EGLImageTargetTexture2DOES(struct _glapi_table *disp) {
    return (_glptr_EGLImageTargetTexture2DOES) (GET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES));
 }
 
-static INLINE void SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) {
+static inline void SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) {
    SET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES, fn);
 }
 
diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c
index 412cc15af..c9e714b21 100644
--- a/mesalib/src/mesa/main/drawpix.c
+++ b/mesalib/src/mesa/main/drawpix.c
@@ -30,6 +30,7 @@
 #include "enums.h"
 #include "feedback.h"
 #include "framebuffer.h"
+#include "image.h"
 #include "mfeatures.h"
 #include "pbo.h"
 #include "readpix.h"
@@ -76,6 +77,23 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       goto end;      /* the error code was recorded */
    }
 
+   /* GL 3.0 introduced a new restriction on glDrawPixels() over what was in
+    * GL_EXT_texture_integer.  From section 3.7.4 ("Rasterization of Pixel
+    * Rectangles) on page 151 of the GL 3.0 specification:
+    *
+    *     "If format contains integer components, as shown in table 3.6, an
+    *      INVALID OPERATION error is generated."
+    *
+    * Since DrawPixels rendering would be merely undefined if not an error (due
+    * to a lack of defined mapping from integer data to gl_Color fragment shader
+    * input), NVIDIA's implementation also just returns this error despite
+    * exposing GL_EXT_texture_integer, just return an error regardless.
+    */
+   if (_mesa_is_integer_format(format)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawPixels(integer format)");
+      goto end;
+   }
+
    if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
       goto end;      /* the error code was recorded */
    }
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index 93ac8be6b..366392f0b 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -584,6 +584,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ENABLE_BIT\0"
    "GL_EQUAL\0"
    "GL_EQUIV\0"
+   "GL_ETC1_RGB8_OES\0"
    "GL_EVAL_BIT\0"
    "GL_EXP\0"
    "GL_EXP2\0"
@@ -2380,7 +2381,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2341] =
+static const enum_elt all_enums[2342] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2929,1883 +2930,1884 @@ static const enum_elt all_enums[2341] =
    { 11152, 0x00002000 }, /* GL_ENABLE_BIT */
    { 11166, 0x00000202 }, /* GL_EQUAL */
    { 11175, 0x00001509 }, /* GL_EQUIV */
-   { 11184, 0x00010000 }, /* GL_EVAL_BIT */
-   { 11196, 0x00000800 }, /* GL_EXP */
-   { 11203, 0x00000801 }, /* GL_EXP2 */
-   { 11211, 0x00001F03 }, /* GL_EXTENSIONS */
-   { 11225, 0x00002400 }, /* GL_EYE_LINEAR */
-   { 11239, 0x00002502 }, /* GL_EYE_PLANE */
-   { 11252, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   { 11277, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   { 11294, 0x00000000 }, /* GL_FALSE */
-   { 11303, 0x00001101 }, /* GL_FASTEST */
-   { 11314, 0x00001C01 }, /* GL_FEEDBACK */
-   { 11326, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   { 11353, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   { 11377, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   { 11401, 0x00001B02 }, /* GL_FILL */
-   { 11409, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
-   { 11436, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   { 11467, 0x0000140C }, /* GL_FIXED */
-   { 11476, 0x0000140C }, /* GL_FIXED_OES */
-   { 11489, 0x0000891D }, /* GL_FIXED_ONLY */
-   { 11503, 0x0000891D }, /* GL_FIXED_ONLY_ARB */
-   { 11521, 0x00001D00 }, /* GL_FLAT */
-   { 11529, 0x00001406 }, /* GL_FLOAT */
-   { 11538, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   { 11552, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   { 11570, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   { 11586, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   { 11602, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   { 11616, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   { 11634, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   { 11650, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   { 11666, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   { 11680, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   { 11698, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   { 11714, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   { 11730, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   { 11744, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   { 11762, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   { 11776, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 11794, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 11808, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 11826, 0x00000B60 }, /* GL_FOG */
-   { 11833, 0x00000080 }, /* GL_FOG_BIT */
-   { 11844, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 11857, 0x00008451 }, /* GL_FOG_COORD */
-   { 11870, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 11888, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 11912, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 11951, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 11994, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 12026, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 12057, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 12086, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 12111, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 12130, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 12164, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 12191, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 12217, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 12241, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 12258, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 12273, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 12297, 0x00000B64 }, /* GL_FOG_END */
-   { 12308, 0x00000C54 }, /* GL_FOG_HINT */
-   { 12320, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 12333, 0x00000B65 }, /* GL_FOG_MODE */
-   { 12345, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 12364, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 12389, 0x00000B63 }, /* GL_FOG_START */
-   { 12402, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 12420, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 12444, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 12463, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 12486, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 12521, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
-   { 12560, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 12575, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 12612, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 12648, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 12689, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 12730, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 12767, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 12804, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
-   { 12838, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
-   { 12876, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 12914, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 12956, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
-   { 12998, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 13036, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 13078, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
-   { 13120, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 13155, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 13194, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 13243, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
-   { 13292, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 13340, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 13392, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
-   { 13444, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 13484, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 13528, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 13568, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 13612, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
-   { 13656, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
-   { 13679, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 13706, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
-   { 13733, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 13757, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 13785, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
-   { 13813, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 13836, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 13855, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 13892, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 13933, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
-   { 13974, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
-   { 14011, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 14052, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
-   { 14093, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-   { 14131, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 14173, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
-   { 14215, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 14266, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 14304, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
-   { 14342, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-   { 14384, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
-   { 14424, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
-   { 14468, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 14513, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 14562, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
-   { 14611, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 14649, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
-   { 14691, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-   { 14729, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 14771, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
-   { 14813, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
-   { 14832, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 14864, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 14889, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 14916, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 14947, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
-   { 14978, 0x00000404 }, /* GL_FRONT */
-   { 14987, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 15005, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 15019, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 15033, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 15048, 0x00008006 }, /* GL_FUNC_ADD */
-   { 15060, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 15076, 0x00008006 }, /* GL_FUNC_ADD_OES */
-   { 15092, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 15117, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 15146, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
-   { 15175, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 15192, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 15213, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
-   { 15234, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 15253, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 15277, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 15306, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 15330, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */
-   { 15353, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-   { 15380, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */
-   { 15404, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-   { 15432, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */
-   { 15451, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
-   { 15474, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */
-   { 15499, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-   { 15528, 0x00000206 }, /* GL_GEQUAL */
-   { 15538, 0x0000912F }, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
-   { 15569, 0x00000204 }, /* GL_GREATER */
-   { 15580, 0x00001904 }, /* GL_GREEN */
-   { 15589, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 15603, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 15617, 0x00008D95 }, /* GL_GREEN_INTEGER */
-   { 15634, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */
-   { 15655, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 15670, 0x00008253 }, /* GL_GUILTY_CONTEXT_RESET_ARB */
-   { 15698, 0x0000140B }, /* GL_HALF_FLOAT */
-   { 15712, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
-   { 15730, 0x00008DF2 }, /* GL_HIGH_FLOAT */
-   { 15744, 0x00008DF5 }, /* GL_HIGH_INT */
-   { 15756, 0x00008000 }, /* GL_HINT_BIT */
-   { 15768, 0x00008024 }, /* GL_HISTOGRAM */
-   { 15781, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 15805, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 15833, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 15856, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 15883, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 15900, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 15920, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 15944, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 15968, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 15996, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 16024, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 16056, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 16078, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 16104, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 16122, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 16144, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 16163, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 16186, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 16201, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 16221, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-   { 16257, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 16297, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-   { 16331, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 16369, 0x00001E02 }, /* GL_INCR */
-   { 16377, 0x00008507 }, /* GL_INCR_WRAP */
-   { 16390, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 16407, 0x00008222 }, /* GL_INDEX */
-   { 16416, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 16431, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 16461, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 16495, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 16518, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 16540, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 16560, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 16574, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 16595, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 16613, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 16627, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 16643, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 16658, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 16677, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 16696, 0x00008254 }, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-   { 16726, 0x00001404 }, /* GL_INT */
-   { 16733, 0x00008049 }, /* GL_INTENSITY */
-   { 16746, 0x0000804C }, /* GL_INTENSITY12 */
-   { 16761, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 16780, 0x0000804D }, /* GL_INTENSITY16 */
-   { 16795, 0x00008D8B }, /* GL_INTENSITY16I_EXT */
-   { 16815, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */
-   { 16836, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 16855, 0x00008D85 }, /* GL_INTENSITY32I_EXT */
-   { 16875, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */
-   { 16896, 0x0000804A }, /* GL_INTENSITY4 */
-   { 16910, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 16928, 0x0000804B }, /* GL_INTENSITY8 */
-   { 16942, 0x00008D91 }, /* GL_INTENSITY8I_EXT */
-   { 16961, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */
-   { 16981, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 16999, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 17016, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */
-   { 17039, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
-   { 17066, 0x00008575 }, /* GL_INTERPOLATE */
-   { 17081, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 17100, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 17119, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
-   { 17141, 0x00008D9F }, /* GL_INT_2_10_10_10_REV */
-   { 17163, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */
-   { 17181, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */
-   { 17205, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */
-   { 17233, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */
-   { 17255, 0x00008DCA }, /* GL_INT_SAMPLER_2D */
-   { 17273, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */
-   { 17297, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */
-   { 17325, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */
-   { 17347, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */
-   { 17370, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */
-   { 17397, 0x00008DCB }, /* GL_INT_SAMPLER_3D */
-   { 17415, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */
-   { 17437, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */
-   { 17459, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */
-   { 17485, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */
-   { 17505, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */
-   { 17529, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 17541, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 17557, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 17569, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 17585, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 17597, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 17613, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 17629, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 17662, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 17699, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
-   { 17736, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 17757, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 17774, 0x0000862B }, /* GL_INVERSE_NV */
-   { 17788, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 17812, 0x0000150A }, /* GL_INVERT */
-   { 17822, 0x00001E00 }, /* GL_KEEP */
-   { 17830, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
-   { 17856, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 17886, 0x00000406 }, /* GL_LEFT */
-   { 17894, 0x00000203 }, /* GL_LEQUAL */
-   { 17904, 0x00000201 }, /* GL_LESS */
-   { 17912, 0x00004000 }, /* GL_LIGHT0 */
-   { 17922, 0x00004001 }, /* GL_LIGHT1 */
-   { 17932, 0x00004002 }, /* GL_LIGHT2 */
-   { 17942, 0x00004003 }, /* GL_LIGHT3 */
-   { 17952, 0x00004004 }, /* GL_LIGHT4 */
-   { 17962, 0x00004005 }, /* GL_LIGHT5 */
-   { 17972, 0x00004006 }, /* GL_LIGHT6 */
-   { 17982, 0x00004007 }, /* GL_LIGHT7 */
-   { 17992, 0x00000B50 }, /* GL_LIGHTING */
-   { 18004, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 18020, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 18043, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 18072, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 18105, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 18133, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 18157, 0x00001B01 }, /* GL_LINE */
-   { 18165, 0x00002601 }, /* GL_LINEAR */
-   { 18175, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 18197, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 18227, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 18258, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 18282, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 18307, 0x00000001 }, /* GL_LINES */
-   { 18316, 0x0000000A }, /* GL_LINES_ADJACENCY */
-   { 18335, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
-   { 18358, 0x00000004 }, /* GL_LINE_BIT */
-   { 18370, 0x00000002 }, /* GL_LINE_LOOP */
-   { 18383, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 18403, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 18418, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 18438, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 18454, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 18478, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 18501, 0x00000003 }, /* GL_LINE_STRIP */
-   { 18515, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */
-   { 18539, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
-   { 18567, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 18581, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 18595, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 18621, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 18641, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 18656, 0x00000B32 }, /* GL_LIST_BASE */
-   { 18669, 0x00020000 }, /* GL_LIST_BIT */
-   { 18681, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 18695, 0x00000B30 }, /* GL_LIST_MODE */
-   { 18708, 0x00000101 }, /* GL_LOAD */
-   { 18716, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 18728, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 18745, 0x00008252 }, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
-   { 18774, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 18788, 0x00008DF0 }, /* GL_LOW_FLOAT */
-   { 18801, 0x00008DF3 }, /* GL_LOW_INT */
-   { 18812, 0x00001909 }, /* GL_LUMINANCE */
-   { 18825, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 18840, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 18863, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 18890, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 18912, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 18938, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 18957, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 18972, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */
-   { 18992, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */
-   { 19013, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 19036, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 19063, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 19082, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */
-   { 19102, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */
-   { 19123, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 19137, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 19158, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 19183, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 19201, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 19222, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 19247, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 19261, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */
-   { 19280, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */
-   { 19300, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 19321, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 19346, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 19364, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 19383, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */
-   { 19409, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */
-   { 19436, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */
-   { 19462, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */
-   { 19489, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */
-   { 19514, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */
-   { 19540, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-   { 19571, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */
-   { 19596, 0x0000821B }, /* GL_MAJOR_VERSION */
-   { 19613, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 19629, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 19649, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 19671, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 19685, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 19700, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 19724, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 19748, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 19772, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 19796, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 19813, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 19830, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 19858, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 19887, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 19916, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 19945, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 19974, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 20003, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 20032, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 20060, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 20088, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 20116, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 20144, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 20172, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 20200, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 20228, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 20256, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 20284, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 20300, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 20320, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 20342, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 20356, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 20371, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 20395, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 20419, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 20443, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 20467, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 20484, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 20501, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 20529, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 20558, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 20587, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 20616, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 20645, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 20674, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 20703, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 20731, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 20759, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 20787, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 20815, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 20843, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 20871, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 20899, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 20927, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 20955, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 20968, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 20994, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 21023, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 21051, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 21067, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 21082, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 21108, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 21125, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 21140, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 21154, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 21170, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 21186, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 21202, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 21218, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 21234, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 21250, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 21266, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 21282, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 21298, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 21314, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 21329, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 21343, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 21359, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 21375, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 21391, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 21407, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 21423, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 21439, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 21455, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 21471, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 21487, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 21503, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 21518, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 21532, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 21548, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 21564, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 21579, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 21593, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 21608, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 21622, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 21637, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 21651, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 21666, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 21680, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 21695, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 21709, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 21724, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 21739, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 21765, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-   { 21806, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
-   { 21832, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 21866, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
-   { 21900, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 21931, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
-   { 21962, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 21995, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
-   { 22028, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 22059, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
-   { 22090, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 22105, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 22127, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
-   { 22149, 0x00008008 }, /* GL_MAX */
-   { 22156, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 22179, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
-   { 22206, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-   { 22234, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 22266, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 22292, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 22325, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 22351, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 22385, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */
-   { 22407, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 22426, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
-   { 22451, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 22480, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 22512, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 22548, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 22584, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 22624, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 22650, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 22680, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 22705, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 22734, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 22763, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 22796, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
-   { 22829, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 22849, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 22873, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 22897, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_NV */
-   { 22920, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 22944, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 22969, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 22987, 0x00008008 }, /* GL_MAX_EXT */
-   { 22998, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
-   { 23031, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 23066, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 23105, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-   { 23137, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
-   { 23170, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
-   { 23204, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
-   { 23236, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
-   { 23272, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-   { 23308, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
-   { 23348, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
-   { 23388, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
-   { 23432, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
-   { 23467, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
-   { 23506, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-   { 23545, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 23559, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 23579, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 23617, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 23646, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 23670, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 23698, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
-   { 23726, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 23749, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 23786, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 23822, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 23849, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 23878, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 23912, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 23948, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 23975, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 24007, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 24043, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 24072, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 24101, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 24129, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 24167, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 24211, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 24254, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 24288, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 24327, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 24364, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 24402, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 24445, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 24488, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 24518, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 24549, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-   { 24577, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET_EXT */
-   { 24609, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 24645, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 24681, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 24711, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
-   { 24741, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 24775, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 24808, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 24833, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 24862, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
-   { 24891, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 24906, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 24925, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 24952, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 24972, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 24996, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-   { 25023, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
-   { 25054, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 25076, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 25102, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 25129, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25160, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 25184, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
-   { 25212, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 25246, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 25266, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 25293, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 25314, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 25339, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 25364, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 25399, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-   { 25448, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-   { 25501, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-   { 25544, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-   { 25591, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-   { 25637, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-   { 25687, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
-   { 25713, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 25735, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 25761, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
-   { 25784, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 25806, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 25832, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-   { 25864, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 25898, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25936, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 25969, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 26006, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-   { 26036, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 26060, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
-   { 26084, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-   { 26121, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 26142, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
-   { 26158, 0x00008DF4 }, /* GL_MEDIUM_INT */
-   { 26172, 0x00008007 }, /* GL_MIN */
-   { 26179, 0x0000802E }, /* GL_MINMAX */
-   { 26189, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 26203, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 26220, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 26241, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 26256, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 26275, 0x0000821C }, /* GL_MINOR_VERSION */
-   { 26292, 0x00008007 }, /* GL_MIN_EXT */
-   { 26303, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-   { 26331, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET_EXT */
-   { 26363, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 26382, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 26405, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 26428, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 26448, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 26468, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 26498, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 26526, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 26554, 0x00001700 }, /* GL_MODELVIEW */
-   { 26567, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 26585, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 26604, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 26623, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 26642, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 26661, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 26680, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 26699, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 26718, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 26737, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 26756, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 26775, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 26793, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 26812, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 26831, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 26850, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 26869, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 26888, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 26907, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 26926, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 26945, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 26964, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 26983, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 27001, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 27020, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 27039, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 27057, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 27075, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 27093, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 27111, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 27129, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 27147, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 27165, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 27185, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 27227, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 27254, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 27279, 0x00002100 }, /* GL_MODULATE */
-   { 27291, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 27311, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 27338, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 27363, 0x00000103 }, /* GL_MULT */
-   { 27371, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 27386, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 27406, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 27425, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 27444, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 27468, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 27491, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 27521, 0x00002A25 }, /* GL_N3F_V3F */
-   { 27532, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 27552, 0x0000150E }, /* GL_NAND */
-   { 27560, 0x00002600 }, /* GL_NEAREST */
-   { 27571, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 27602, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 27634, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 27659, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 27685, 0x00000200 }, /* GL_NEVER */
-   { 27694, 0x00001102 }, /* GL_NICEST */
-   { 27704, 0x00000000 }, /* GL_NONE */
-   { 27712, 0x00000000 }, /* GL_NONE_OES */
-   { 27724, 0x00001505 }, /* GL_NOOP */
-   { 27732, 0x00001508 }, /* GL_NOR */
-   { 27739, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 27752, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 27768, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 27799, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 27834, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 27858, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 27881, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 27902, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 27916, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 27934, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 27951, 0x00008511 }, /* GL_NORMAL_MAP_OES */
-   { 27969, 0x00000205 }, /* GL_NOTEQUAL */
-   { 27981, 0x00000000 }, /* GL_NO_ERROR */
-   { 27993, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
-   { 28022, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 28056, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 28094, 0x0000821D }, /* GL_NUM_EXTENSIONS */
-   { 28112, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-   { 28142, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 28176, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 28205, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 28237, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 28279, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 28309, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 28349, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 28380, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 28409, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 28437, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 28467, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 28484, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 28510, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 28526, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 28561, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 28583, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 28598, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 28617, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 28647, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 28668, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 28696, 0x00000001 }, /* GL_ONE */
-   { 28703, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 28731, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 28763, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 28791, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 28823, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 28846, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 28869, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 28892, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 28915, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 28933, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 28955, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 28977, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 28993, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 29013, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 29033, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 29051, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 29073, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 29095, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 29111, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 29131, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 29151, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 29169, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 29191, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 29213, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 29229, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 29249, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 29269, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 29290, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 29309, 0x00001507 }, /* GL_OR */
-   { 29315, 0x00000A01 }, /* GL_ORDER */
-   { 29324, 0x0000150D }, /* GL_OR_INVERTED */
-   { 29339, 0x0000150B }, /* GL_OR_REVERSE */
-   { 29353, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 29370, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 29388, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 29409, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 29429, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 29447, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 29466, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 29486, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 29506, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 29524, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 29543, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 29568, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 29592, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 29613, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 29635, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 29657, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 29682, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 29706, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 29727, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 29749, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 29771, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 29793, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 29824, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 29844, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 29869, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 29889, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 29914, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 29934, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 29959, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 29979, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 30004, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 30024, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 30049, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 30069, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 30094, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 30114, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 30139, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 30159, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 30184, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 30204, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 30229, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 30249, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 30274, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 30292, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 30313, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 30342, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 30375, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 30400, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 30423, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 30454, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 30489, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 30516, 0x00001B00 }, /* GL_POINT */
-   { 30525, 0x00000000 }, /* GL_POINTS */
-   { 30535, 0x00000002 }, /* GL_POINT_BIT */
-   { 30548, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 30578, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 30612, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 30646, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 30681, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 30710, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 30743, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 30776, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 30810, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 30824, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 30863, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 30887, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 30919, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 30950, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 30979, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 31005, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 31023, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 31045, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 31067, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 31090, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 31108, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 31130, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 31152, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 31175, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 31195, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 31211, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 31232, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 31248, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 31268, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 31297, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 31316, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 31336, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 31362, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 31377, 0x00000009 }, /* GL_POLYGON */
-   { 31388, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 31403, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 31419, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 31442, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 31467, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 31490, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 31513, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 31537, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 31561, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 31579, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 31602, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 31621, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 31644, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 31661, 0x00001203 }, /* GL_POSITION */
-   { 31673, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 31705, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 31741, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 31774, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 31811, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 31842, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 31877, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 31909, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 31945, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31978, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 32010, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 32046, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 32079, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 32116, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 32146, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 32180, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 32211, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 32246, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 32277, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 32312, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 32344, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 32380, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 32410, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 32444, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 32475, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 32510, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 32542, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 32573, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 32608, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 32640, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 32676, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 32705, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 32738, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 32768, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 32802, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 32841, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 32874, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 32914, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 32948, 0x00008578 }, /* GL_PREVIOUS */
-   { 32960, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 32976, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 32992, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 33009, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 33030, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 33051, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
-   { 33075, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 33103, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
-   { 33124, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
-   { 33151, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-   { 33181, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
-   { 33205, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 33238, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 33270, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 33293, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
-   { 33319, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 33349, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
-   { 33374, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 33403, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-   { 33438, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 33461, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 33491, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 33520, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 33548, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 33570, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 33598, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 33626, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 33648, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 33669, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 33709, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 33748, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 33778, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 33813, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 33846, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 33880, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 33919, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 33958, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 33980, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 34006, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 34030, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
-   { 34052, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 34078, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 34101, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 34123, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 34144, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 34165, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 34192, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 34224, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 34256, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 34291, 0x00001701 }, /* GL_PROJECTION */
-   { 34305, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 34326, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 34369, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 34395, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 34415, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 34439, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 34460, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 34479, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 34502, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 34541, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 34579, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 34599, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
-   { 34625, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 34655, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 34679, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 34699, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
-   { 34725, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 34755, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 34779, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 34799, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 34832, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 34858, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 34888, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
-   { 34915, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 34946, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 34976, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 34995, 0x00002003 }, /* GL_Q */
-   { 35000, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 35025, 0x00000007 }, /* GL_QUADS */
-   { 35034, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 35078, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 35126, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 35143, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 35157, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
-   { 35184, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 35214, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
-   { 35238, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 35265, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 35287, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 35313, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
-   { 35330, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 35350, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 35366, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 35386, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 35412, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 35442, 0x00008E13 }, /* GL_QUERY_WAIT */
-   { 35456, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 35473, 0x00002002 }, /* GL_R */
-   { 35478, 0x00008C3A }, /* GL_R11F_G11F_B10F */
-   { 35496, 0x00008F98 }, /* GL_R16_SNORM */
-   { 35509, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 35521, 0x00008F94 }, /* GL_R8_SNORM */
-   { 35533, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
-   { 35555, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 35581, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 35614, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 35629, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 35649, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 35677, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 35709, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 35733, 0x000088B8 }, /* GL_READ_ONLY */
-   { 35746, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 35763, 0x000088BA }, /* GL_READ_WRITE */
-   { 35777, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 35795, 0x00001903 }, /* GL_RED */
-   { 35802, 0x00008016 }, /* GL_REDUCE */
-   { 35812, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 35826, 0x00000D15 }, /* GL_RED_BIAS */
-   { 35838, 0x00000D52 }, /* GL_RED_BITS */
-   { 35850, 0x00008D94 }, /* GL_RED_INTEGER */
-   { 35865, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
-   { 35884, 0x00000D14 }, /* GL_RED_SCALE */
-   { 35897, 0x00008F90 }, /* GL_RED_SNORM */
-   { 35910, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 35928, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 35950, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 35971, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 35993, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 36011, 0x00001C00 }, /* GL_RENDER */
-   { 36021, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 36037, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 36064, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 36095, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 36119, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 36147, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 36175, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 36201, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 36231, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 36258, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 36289, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 36309, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 36336, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 36367, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 36390, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 36417, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 36444, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 36476, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 36512, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 36548, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 36568, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 36593, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 36622, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 36646, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 36674, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 36703, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 36736, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 36758, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 36784, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 36810, 0x00001F01 }, /* GL_RENDERER */
-   { 36822, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 36837, 0x00002901 }, /* GL_REPEAT */
-   { 36847, 0x00001E01 }, /* GL_REPLACE */
-   { 36858, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 36873, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 36896, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-   { 36932, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 36950, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 36972, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-   { 37007, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 37025, 0x00000102 }, /* GL_RETURN */
-   { 37035, 0x00008F99 }, /* GL_RG16_SNORM */
-   { 37049, 0x00008F95 }, /* GL_RG8_SNORM */
-   { 37062, 0x00001907 }, /* GL_RGB */
-   { 37069, 0x00008052 }, /* GL_RGB10 */
-   { 37078, 0x00008059 }, /* GL_RGB10_A2 */
-   { 37090, 0x0000906F }, /* GL_RGB10_A2UI */
-   { 37104, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 37120, 0x00008052 }, /* GL_RGB10_EXT */
-   { 37133, 0x00008053 }, /* GL_RGB12 */
-   { 37142, 0x00008053 }, /* GL_RGB12_EXT */
-   { 37155, 0x00008054 }, /* GL_RGB16 */
-   { 37164, 0x0000881B }, /* GL_RGB16F */
-   { 37174, 0x00008D89 }, /* GL_RGB16I */
-   { 37184, 0x00008D89 }, /* GL_RGB16I_EXT */
-   { 37198, 0x00008D77 }, /* GL_RGB16UI */
-   { 37209, 0x00008D77 }, /* GL_RGB16UI_EXT */
-   { 37224, 0x00008054 }, /* GL_RGB16_EXT */
-   { 37237, 0x00008F9A }, /* GL_RGB16_SNORM */
-   { 37252, 0x0000804E }, /* GL_RGB2_EXT */
-   { 37264, 0x00008815 }, /* GL_RGB32F */
-   { 37274, 0x00008D83 }, /* GL_RGB32I */
-   { 37284, 0x00008D83 }, /* GL_RGB32I_EXT */
-   { 37298, 0x00008D71 }, /* GL_RGB32UI */
-   { 37309, 0x00008D71 }, /* GL_RGB32UI_EXT */
-   { 37324, 0x0000804F }, /* GL_RGB4 */
-   { 37332, 0x0000804F }, /* GL_RGB4_EXT */
-   { 37344, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 37357, 0x00008050 }, /* GL_RGB5 */
-   { 37365, 0x00008D62 }, /* GL_RGB565 */
-   { 37375, 0x00008D62 }, /* GL_RGB565_OES */
-   { 37389, 0x00008057 }, /* GL_RGB5_A1 */
-   { 37400, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 37415, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 37430, 0x00008050 }, /* GL_RGB5_EXT */
-   { 37442, 0x00008051 }, /* GL_RGB8 */
-   { 37450, 0x00008D8F }, /* GL_RGB8I */
-   { 37459, 0x00008D8F }, /* GL_RGB8I_EXT */
-   { 37472, 0x00008D7D }, /* GL_RGB8UI */
-   { 37482, 0x00008D7D }, /* GL_RGB8UI_EXT */
-   { 37496, 0x00008051 }, /* GL_RGB8_EXT */
-   { 37508, 0x00008051 }, /* GL_RGB8_OES */
-   { 37520, 0x00008F96 }, /* GL_RGB8_SNORM */
-   { 37534, 0x00008C3D }, /* GL_RGB9_E5 */
-   { 37545, 0x00001908 }, /* GL_RGBA */
-   { 37553, 0x0000805A }, /* GL_RGBA12 */
-   { 37563, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 37577, 0x0000805B }, /* GL_RGBA16 */
-   { 37587, 0x0000881A }, /* GL_RGBA16F */
-   { 37598, 0x00008D88 }, /* GL_RGBA16I */
-   { 37609, 0x00008D88 }, /* GL_RGBA16I_EXT */
-   { 37624, 0x00008D76 }, /* GL_RGBA16UI */
-   { 37636, 0x00008D76 }, /* GL_RGBA16UI_EXT */
-   { 37652, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 37666, 0x00008F9B }, /* GL_RGBA16_SNORM */
-   { 37682, 0x00008055 }, /* GL_RGBA2 */
-   { 37691, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 37704, 0x00008814 }, /* GL_RGBA32F */
-   { 37715, 0x00008D82 }, /* GL_RGBA32I */
-   { 37726, 0x00008D82 }, /* GL_RGBA32I_EXT */
-   { 37741, 0x00008D70 }, /* GL_RGBA32UI */
-   { 37753, 0x00008D70 }, /* GL_RGBA32UI_EXT */
-   { 37769, 0x00008056 }, /* GL_RGBA4 */
-   { 37778, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 37797, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 37810, 0x00008056 }, /* GL_RGBA4_OES */
-   { 37823, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 37837, 0x00008058 }, /* GL_RGBA8 */
-   { 37846, 0x00008D8E }, /* GL_RGBA8I */
-   { 37856, 0x00008D8E }, /* GL_RGBA8I_EXT */
-   { 37870, 0x00008D7C }, /* GL_RGBA8UI */
-   { 37881, 0x00008D7C }, /* GL_RGBA8UI_EXT */
-   { 37896, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 37909, 0x00008058 }, /* GL_RGBA8_OES */
-   { 37922, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 37937, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 37955, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
-   { 37978, 0x00008D99 }, /* GL_RGBA_INTEGER */
-   { 37994, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
-   { 38014, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
-   { 38039, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 38052, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 38065, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 38079, 0x00008D98 }, /* GL_RGB_INTEGER */
-   { 38094, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
-   { 38113, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 38125, 0x00008573 }, /* GL_RGB_SCALE */
-   { 38138, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 38155, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 38172, 0x00008F92 }, /* GL_RGB_SNORM */
-   { 38185, 0x00008F91 }, /* GL_RG_SNORM */
-   { 38197, 0x00000407 }, /* GL_RIGHT */
-   { 38206, 0x00002000 }, /* GL_S */
-   { 38211, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 38225, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
-   { 38245, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
-   { 38269, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-   { 38296, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
-   { 38327, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 38348, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 38362, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
-   { 38382, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
-   { 38406, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-   { 38433, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
-   { 38464, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
-   { 38483, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
-   { 38509, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 38530, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 38544, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 38562, 0x00008919 }, /* GL_SAMPLER_BINDING */
-   { 38581, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 38599, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 38621, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 38637, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 38660, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 38687, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
-   { 38711, 0x000080A9 }, /* GL_SAMPLES */
-   { 38722, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 38738, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 38753, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 38771, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 38793, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 38821, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 38853, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 38876, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 38903, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 38921, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 38944, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 38966, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 38985, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 39008, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 39034, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 39064, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 39089, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 39118, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 39133, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 39148, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 39164, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 39189, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 39229, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 39273, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 39306, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 39336, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 39368, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 39398, 0x00001C02 }, /* GL_SELECT */
-   { 39408, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 39436, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 39461, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 39477, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 39497, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 39521, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 39548, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 39579, 0x0000150F }, /* GL_SET */
-   { 39586, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 39611, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 39630, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 39651, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 39675, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 39690, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 39705, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 39733, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 39756, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 39786, 0x00001601 }, /* GL_SHININESS */
-   { 39799, 0x00001402 }, /* GL_SHORT */
-   { 39808, 0x00009119 }, /* GL_SIGNALED */
-   { 39820, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 39841, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 39857, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 39877, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 39896, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 39910, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 39925, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 39947, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 39967, 0x00001D01 }, /* GL_SMOOTH */
-   { 39977, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 40010, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 40037, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 40070, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 40097, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 40114, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 40135, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 40156, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 40171, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 40190, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 40209, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 40226, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 40247, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 40268, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 40283, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 40302, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 40321, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 40338, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 40359, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 40380, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 40395, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 40414, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 40433, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 40453, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 40471, 0x00001202 }, /* GL_SPECULAR */
-   { 40483, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 40497, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 40512, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 40530, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 40547, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 40561, 0x00008580 }, /* GL_SRC0_RGB */
-   { 40573, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 40587, 0x00008581 }, /* GL_SRC1_RGB */
-   { 40599, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 40613, 0x00008582 }, /* GL_SRC2_RGB */
-   { 40625, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 40638, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 40660, 0x00000300 }, /* GL_SRC_COLOR */
-   { 40673, 0x00008C40 }, /* GL_SRGB */
-   { 40681, 0x00008C41 }, /* GL_SRGB8 */
-   { 40690, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 40706, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 40720, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 40738, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 40757, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 40772, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 40791, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 40806, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 40825, 0x000088E5 }, /* GL_STATIC_READ */
-   { 40840, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 40859, 0x00001802 }, /* GL_STENCIL */
-   { 40870, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 40892, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 40918, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 40944, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 40965, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 40990, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 41011, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 41036, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 41068, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 41104, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 41136, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 41172, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 41192, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 41219, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 41245, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 41261, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 41279, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 41301, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 41324, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 41340, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 41356, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 41373, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 41391, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 41410, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 41433, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 41455, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 41477, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 41495, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 41517, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 41539, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 41557, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 41579, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 41601, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 41622, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 41649, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 41676, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 41691, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 41707, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 41736, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 41758, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 41779, 0x00000C33 }, /* GL_STEREO */
-   { 41789, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 41813, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 41838, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 41862, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 41877, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 41896, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 41911, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 41930, 0x000088E1 }, /* GL_STREAM_READ */
-   { 41945, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 41964, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 41981, 0x000084E7 }, /* GL_SUBTRACT */
-   { 41993, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 42009, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 42027, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 42041, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 42055, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 42082, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 42112, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 42127, 0x00002001 }, /* GL_T */
-   { 42132, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 42147, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 42166, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 42182, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 42197, 0x00002A27 }, /* GL_T2F_V3F */
-   { 42208, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 42227, 0x00002A28 }, /* GL_T4F_V4F */
-   { 42238, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 42261, 0x00001702 }, /* GL_TEXTURE */
-   { 42272, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 42284, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 42300, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 42312, 0x000084CA }, /* GL_TEXTURE10 */
-   { 42325, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 42342, 0x000084CB }, /* GL_TEXTURE11 */
-   { 42355, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 42372, 0x000084CC }, /* GL_TEXTURE12 */
-   { 42385, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 42402, 0x000084CD }, /* GL_TEXTURE13 */
-   { 42415, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 42432, 0x000084CE }, /* GL_TEXTURE14 */
-   { 42445, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 42462, 0x000084CF }, /* GL_TEXTURE15 */
-   { 42475, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 42492, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 42505, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 42522, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 42535, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 42552, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 42565, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 42582, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 42595, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 42612, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 42628, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 42640, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 42653, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 42670, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 42683, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 42700, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 42713, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 42730, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 42743, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 42760, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 42773, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 42790, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 42803, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 42820, 0x000084DA }, /* GL_TEXTURE26 */
-   { 42833, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 42850, 0x000084DB }, /* GL_TEXTURE27 */
-   { 42863, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 42880, 0x000084DC }, /* GL_TEXTURE28 */
-   { 42893, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 42910, 0x000084DD }, /* GL_TEXTURE29 */
-   { 42923, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 42940, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 42956, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 42968, 0x000084DE }, /* GL_TEXTURE30 */
-   { 42981, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 42998, 0x000084DF }, /* GL_TEXTURE31 */
-   { 43011, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 43028, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 43044, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 43056, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 43072, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 43084, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 43100, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 43112, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 43128, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 43140, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 43156, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 43168, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 43184, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 43196, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 43212, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 43226, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 43246, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 43270, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 43284, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 43304, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 43328, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 43342, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 43360, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 43382, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 43408, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 43430, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 43452, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 43480, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 43512, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 43534, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 43562, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 43594, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 43616, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 43642, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 43668, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
-   { 43698, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 43726, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 43758, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 43790, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-   { 43822, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 43851, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 43884, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 43916, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 43931, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 43952, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 43977, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 43995, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 44019, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 44037, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
-   { 44059, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 44096, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
-   { 44137, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 44162, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
-   { 44191, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 44222, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 44252, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 44282, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 44317, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 44348, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 44386, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 44413, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 44445, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 44479, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 44503, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 44531, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 44555, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 44583, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 44616, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 44640, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 44662, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 44684, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 44710, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 44744, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 44777, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 44814, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 44842, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 44874, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 44897, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 44935, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 44977, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 45008, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 45036, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 45066, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 45094, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 45119, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 45139, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 45163, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 45194, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 45229, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 45264, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 45295, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 45330, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 45365, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 45396, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 45431, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 45466, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 45490, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 45521, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 45556, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 45591, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 45622, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 45657, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 45692, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 45723, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 45758, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 45793, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 45822, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 45839, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 45861, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 45887, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 45902, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 45923, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 45943, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
-   { 45967, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 45993, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 46023, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 46043, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 46067, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 46084, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 46101, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 46118, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 46141, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 46158, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 46183, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 46205, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 46231, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 46249, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 46275, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 46301, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 46331, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 46358, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 46383, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 46403, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 46427, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 46454, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 46481, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 46508, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 46534, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 46564, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 46586, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 46604, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 46644, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 46674, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 46702, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 46730, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 46758, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 46779, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 46798, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 46820, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 46839, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 46859, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 46889, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 46920, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 46941, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 46966, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 46990, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 47010, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 47034, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 47054, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 47077, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 47100, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 47124, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 47152, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 47182, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 47207, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 47241, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 47258, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 47276, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 47298, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 47316, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 47334, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 47353, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 47373, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 47392, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 47421, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 47438, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 47460, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 47490, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 47519, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 47555, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 47592, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 47633, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 47666, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 47700, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 47738, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 47774, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 47808, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 47846, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 47881, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 47920, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 47961, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 48006, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 48037, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 48072, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 48113, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 48158, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 48184, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 48214, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 48246, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 48276, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 48310, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 48326, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 48357, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 48392, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 48420, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 48452, 0x00000004 }, /* GL_TRIANGLES */
-   { 48465, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 48488, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 48515, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 48531, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 48552, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 48570, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 48598, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 48630, 0x00000001 }, /* GL_TRUE */
-   { 48638, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 48657, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-   { 48686, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 48706, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 48729, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 48749, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 48770, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 48792, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 48814, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 48834, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 48855, 0x00009118 }, /* GL_UNSIGNALED */
-   { 48869, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 48886, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 48913, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 48936, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 48952, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 48984, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 49011, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 49042, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 49063, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 49088, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 49112, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 49137, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 49168, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 49203, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 49231, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 49255, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 49283, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 49310, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 49343, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 49380, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 49411, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 49438, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 49471, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 49508, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 49539, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 49571, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 49607, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 49634, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 49665, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 49696, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 49731, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 49760, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 49793, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 49814, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 49839, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 49860, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 49885, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 49906, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 49931, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 49954, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 49972, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 50002, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 50036, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 50062, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 50092, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 50126, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 50152, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 50176, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 50204, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 50232, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 50259, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 50291, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 50322, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 50336, 0x00002A20 }, /* GL_V2F */
-   { 50343, 0x00002A21 }, /* GL_V3F */
-   { 50350, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 50369, 0x00001F00 }, /* GL_VENDOR */
-   { 50379, 0x00001F02 }, /* GL_VERSION */
-   { 50390, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 50406, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 50430, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 50460, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 50491, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 50526, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 50550, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 50571, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 50594, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 50615, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 50642, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 50670, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 50698, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 50726, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 50754, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 50782, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 50810, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 50837, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 50864, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 50891, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 50918, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 50945, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 50972, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 50999, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 51026, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 51053, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 51091, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 51133, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 51168, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 51199, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 51234, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 51265, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 51300, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 51334, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 51372, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 51403, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 51438, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 51466, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 51498, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 51528, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 51562, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 51590, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 51622, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 51642, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 51664, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 51693, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 51714, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 51743, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 51776, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 51808, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 51835, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 51866, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 51896, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 51913, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 51934, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 51961, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 51973, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 51989, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 52007, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 52022, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 52042, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 52073, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 52108, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 52143, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 52163, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 52191, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 52219, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 52244, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 52269, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 52296, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 52323, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 52348, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 52373, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 52397, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 52416, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 52430, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 52448, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 52466, 0x00001506 }, /* GL_XOR */
-   { 52473, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 52492, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 52506, 0x00000000 }, /* GL_ZERO */
-   { 52514, 0x00000D16 }, /* GL_ZOOM_X */
-   { 52524, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 11184, 0x00008D64 }, /* GL_ETC1_RGB8_OES */
+   { 11201, 0x00010000 }, /* GL_EVAL_BIT */
+   { 11213, 0x00000800 }, /* GL_EXP */
+   { 11220, 0x00000801 }, /* GL_EXP2 */
+   { 11228, 0x00001F03 }, /* GL_EXTENSIONS */
+   { 11242, 0x00002400 }, /* GL_EYE_LINEAR */
+   { 11256, 0x00002502 }, /* GL_EYE_PLANE */
+   { 11269, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   { 11294, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   { 11311, 0x00000000 }, /* GL_FALSE */
+   { 11320, 0x00001101 }, /* GL_FASTEST */
+   { 11331, 0x00001C01 }, /* GL_FEEDBACK */
+   { 11343, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   { 11370, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   { 11394, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   { 11418, 0x00001B02 }, /* GL_FILL */
+   { 11426, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
+   { 11453, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   { 11484, 0x0000140C }, /* GL_FIXED */
+   { 11493, 0x0000140C }, /* GL_FIXED_OES */
+   { 11506, 0x0000891D }, /* GL_FIXED_ONLY */
+   { 11520, 0x0000891D }, /* GL_FIXED_ONLY_ARB */
+   { 11538, 0x00001D00 }, /* GL_FLAT */
+   { 11546, 0x00001406 }, /* GL_FLOAT */
+   { 11555, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   { 11569, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   { 11587, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   { 11603, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   { 11619, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   { 11633, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   { 11651, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   { 11667, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   { 11683, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   { 11697, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   { 11715, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   { 11731, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   { 11747, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   { 11761, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   { 11779, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   { 11793, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 11811, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 11825, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 11843, 0x00000B60 }, /* GL_FOG */
+   { 11850, 0x00000080 }, /* GL_FOG_BIT */
+   { 11861, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 11874, 0x00008451 }, /* GL_FOG_COORD */
+   { 11887, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 11905, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 11929, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 11968, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 12011, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 12043, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 12074, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 12103, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 12128, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 12147, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 12181, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 12208, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 12234, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 12258, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 12275, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 12290, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 12314, 0x00000B64 }, /* GL_FOG_END */
+   { 12325, 0x00000C54 }, /* GL_FOG_HINT */
+   { 12337, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 12350, 0x00000B65 }, /* GL_FOG_MODE */
+   { 12362, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 12381, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 12406, 0x00000B63 }, /* GL_FOG_START */
+   { 12419, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 12437, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 12461, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 12480, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 12503, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 12538, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
+   { 12577, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 12592, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 12629, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 12665, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 12706, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 12747, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 12784, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 12821, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
+   { 12855, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
+   { 12893, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 12931, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 12973, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
+   { 13015, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 13053, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 13095, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
+   { 13137, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 13172, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 13211, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 13260, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
+   { 13309, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 13357, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 13409, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
+   { 13461, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 13501, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 13545, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 13585, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 13629, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
+   { 13673, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
+   { 13696, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 13723, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
+   { 13750, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 13774, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 13802, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
+   { 13830, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 13853, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 13872, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 13909, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 13950, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
+   { 13991, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
+   { 14028, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 14069, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
+   { 14110, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+   { 14148, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 14190, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
+   { 14232, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 14283, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 14321, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
+   { 14359, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+   { 14401, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
+   { 14441, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
+   { 14485, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 14530, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 14579, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
+   { 14628, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 14666, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
+   { 14708, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+   { 14746, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 14788, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
+   { 14830, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
+   { 14849, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 14881, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 14906, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 14933, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 14964, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
+   { 14995, 0x00000404 }, /* GL_FRONT */
+   { 15004, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 15022, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 15036, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 15050, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 15065, 0x00008006 }, /* GL_FUNC_ADD */
+   { 15077, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 15093, 0x00008006 }, /* GL_FUNC_ADD_OES */
+   { 15109, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 15134, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 15163, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
+   { 15192, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 15209, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 15230, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
+   { 15251, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 15270, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 15294, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 15323, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 15347, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */
+   { 15370, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+   { 15397, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */
+   { 15421, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+   { 15449, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */
+   { 15468, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
+   { 15491, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */
+   { 15516, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+   { 15545, 0x00000206 }, /* GL_GEQUAL */
+   { 15555, 0x0000912F }, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
+   { 15586, 0x00000204 }, /* GL_GREATER */
+   { 15597, 0x00001904 }, /* GL_GREEN */
+   { 15606, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 15620, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 15634, 0x00008D95 }, /* GL_GREEN_INTEGER */
+   { 15651, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */
+   { 15672, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 15687, 0x00008253 }, /* GL_GUILTY_CONTEXT_RESET_ARB */
+   { 15715, 0x0000140B }, /* GL_HALF_FLOAT */
+   { 15729, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
+   { 15747, 0x00008DF2 }, /* GL_HIGH_FLOAT */
+   { 15761, 0x00008DF5 }, /* GL_HIGH_INT */
+   { 15773, 0x00008000 }, /* GL_HINT_BIT */
+   { 15785, 0x00008024 }, /* GL_HISTOGRAM */
+   { 15798, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 15822, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 15850, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 15873, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 15900, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 15917, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 15937, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 15961, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 15985, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 16013, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 16041, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 16073, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 16095, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 16121, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 16139, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 16161, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 16180, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 16203, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 16218, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 16238, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+   { 16274, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 16314, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+   { 16348, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 16386, 0x00001E02 }, /* GL_INCR */
+   { 16394, 0x00008507 }, /* GL_INCR_WRAP */
+   { 16407, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 16424, 0x00008222 }, /* GL_INDEX */
+   { 16433, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 16448, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 16478, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 16512, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 16535, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 16557, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 16577, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 16591, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 16612, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 16630, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 16644, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 16660, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 16675, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 16694, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 16713, 0x00008254 }, /* GL_INNOCENT_CONTEXT_RESET_ARB */
+   { 16743, 0x00001404 }, /* GL_INT */
+   { 16750, 0x00008049 }, /* GL_INTENSITY */
+   { 16763, 0x0000804C }, /* GL_INTENSITY12 */
+   { 16778, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 16797, 0x0000804D }, /* GL_INTENSITY16 */
+   { 16812, 0x00008D8B }, /* GL_INTENSITY16I_EXT */
+   { 16832, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */
+   { 16853, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 16872, 0x00008D85 }, /* GL_INTENSITY32I_EXT */
+   { 16892, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */
+   { 16913, 0x0000804A }, /* GL_INTENSITY4 */
+   { 16927, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 16945, 0x0000804B }, /* GL_INTENSITY8 */
+   { 16959, 0x00008D91 }, /* GL_INTENSITY8I_EXT */
+   { 16978, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */
+   { 16998, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 17016, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 17033, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */
+   { 17056, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
+   { 17083, 0x00008575 }, /* GL_INTERPOLATE */
+   { 17098, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 17117, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 17136, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
+   { 17158, 0x00008D9F }, /* GL_INT_2_10_10_10_REV */
+   { 17180, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */
+   { 17198, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */
+   { 17222, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */
+   { 17250, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */
+   { 17272, 0x00008DCA }, /* GL_INT_SAMPLER_2D */
+   { 17290, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */
+   { 17314, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */
+   { 17342, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */
+   { 17364, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */
+   { 17387, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */
+   { 17414, 0x00008DCB }, /* GL_INT_SAMPLER_3D */
+   { 17432, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */
+   { 17454, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */
+   { 17476, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */
+   { 17502, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */
+   { 17522, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */
+   { 17546, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 17558, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 17574, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 17586, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 17602, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 17614, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 17630, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 17646, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 17679, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 17716, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
+   { 17753, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 17774, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 17791, 0x0000862B }, /* GL_INVERSE_NV */
+   { 17805, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 17829, 0x0000150A }, /* GL_INVERT */
+   { 17839, 0x00001E00 }, /* GL_KEEP */
+   { 17847, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
+   { 17873, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 17903, 0x00000406 }, /* GL_LEFT */
+   { 17911, 0x00000203 }, /* GL_LEQUAL */
+   { 17921, 0x00000201 }, /* GL_LESS */
+   { 17929, 0x00004000 }, /* GL_LIGHT0 */
+   { 17939, 0x00004001 }, /* GL_LIGHT1 */
+   { 17949, 0x00004002 }, /* GL_LIGHT2 */
+   { 17959, 0x00004003 }, /* GL_LIGHT3 */
+   { 17969, 0x00004004 }, /* GL_LIGHT4 */
+   { 17979, 0x00004005 }, /* GL_LIGHT5 */
+   { 17989, 0x00004006 }, /* GL_LIGHT6 */
+   { 17999, 0x00004007 }, /* GL_LIGHT7 */
+   { 18009, 0x00000B50 }, /* GL_LIGHTING */
+   { 18021, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 18037, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 18060, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 18089, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 18122, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 18150, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 18174, 0x00001B01 }, /* GL_LINE */
+   { 18182, 0x00002601 }, /* GL_LINEAR */
+   { 18192, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 18214, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 18244, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 18275, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 18299, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 18324, 0x00000001 }, /* GL_LINES */
+   { 18333, 0x0000000A }, /* GL_LINES_ADJACENCY */
+   { 18352, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
+   { 18375, 0x00000004 }, /* GL_LINE_BIT */
+   { 18387, 0x00000002 }, /* GL_LINE_LOOP */
+   { 18400, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 18420, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 18435, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 18455, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 18471, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 18495, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 18518, 0x00000003 }, /* GL_LINE_STRIP */
+   { 18532, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */
+   { 18556, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
+   { 18584, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 18598, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 18612, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 18638, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 18658, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 18673, 0x00000B32 }, /* GL_LIST_BASE */
+   { 18686, 0x00020000 }, /* GL_LIST_BIT */
+   { 18698, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 18712, 0x00000B30 }, /* GL_LIST_MODE */
+   { 18725, 0x00000101 }, /* GL_LOAD */
+   { 18733, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 18745, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 18762, 0x00008252 }, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
+   { 18791, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 18805, 0x00008DF0 }, /* GL_LOW_FLOAT */
+   { 18818, 0x00008DF3 }, /* GL_LOW_INT */
+   { 18829, 0x00001909 }, /* GL_LUMINANCE */
+   { 18842, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 18857, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 18880, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 18907, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 18929, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 18955, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 18974, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 18989, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */
+   { 19009, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */
+   { 19030, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 19053, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 19080, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 19099, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */
+   { 19119, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */
+   { 19140, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 19154, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 19175, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 19200, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 19218, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 19239, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 19264, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 19278, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */
+   { 19297, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */
+   { 19317, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 19338, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 19363, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 19381, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 19400, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */
+   { 19426, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */
+   { 19453, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */
+   { 19479, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */
+   { 19506, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */
+   { 19531, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */
+   { 19557, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
+   { 19588, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */
+   { 19613, 0x0000821B }, /* GL_MAJOR_VERSION */
+   { 19630, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 19646, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 19666, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 19688, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 19702, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 19717, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 19741, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 19765, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 19789, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 19813, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 19830, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 19847, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 19875, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 19904, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 19933, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 19962, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 19991, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 20020, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 20049, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 20077, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 20105, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 20133, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 20161, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 20189, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 20217, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 20245, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 20273, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 20301, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 20317, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 20337, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 20359, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 20373, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 20388, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 20412, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 20436, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 20460, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 20484, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 20501, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 20518, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 20546, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 20575, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 20604, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 20633, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 20662, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 20691, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 20720, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 20748, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 20776, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 20804, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 20832, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 20860, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 20888, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 20916, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 20944, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 20972, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 20985, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 21011, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 21040, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 21068, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 21084, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 21099, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 21125, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 21142, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 21157, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 21171, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 21187, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 21203, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 21219, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 21235, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 21251, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 21267, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 21283, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 21299, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 21315, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 21331, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 21346, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 21360, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 21376, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 21392, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 21408, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 21424, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 21440, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 21456, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 21472, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 21488, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 21504, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 21520, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 21535, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 21549, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 21565, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 21581, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 21596, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 21610, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 21625, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 21639, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 21654, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 21668, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 21683, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 21697, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 21712, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 21726, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 21741, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 21756, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 21782, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+   { 21823, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
+   { 21849, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 21883, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
+   { 21917, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 21948, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
+   { 21979, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 22012, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
+   { 22045, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 22076, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
+   { 22107, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 22122, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 22144, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
+   { 22166, 0x00008008 }, /* GL_MAX */
+   { 22173, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 22196, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
+   { 22223, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
+   { 22251, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 22283, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 22309, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 22342, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 22368, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 22402, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */
+   { 22424, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 22443, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
+   { 22468, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 22497, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 22529, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 22565, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 22601, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 22641, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 22667, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 22697, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 22722, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 22751, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 22780, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 22813, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
+   { 22846, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 22866, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 22890, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 22914, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_NV */
+   { 22937, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 22961, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 22986, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 23004, 0x00008008 }, /* GL_MAX_EXT */
+   { 23015, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
+   { 23048, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 23083, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 23122, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+   { 23154, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
+   { 23187, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
+   { 23221, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
+   { 23253, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
+   { 23289, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
+   { 23325, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
+   { 23365, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
+   { 23405, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
+   { 23449, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
+   { 23484, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
+   { 23523, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+   { 23562, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 23576, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 23596, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 23634, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 23663, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 23687, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 23715, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
+   { 23743, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 23766, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 23803, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 23839, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 23866, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 23895, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 23929, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 23965, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 23992, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 24024, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 24060, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 24089, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 24118, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 24146, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 24184, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 24228, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 24271, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 24305, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 24344, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 24381, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 24419, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 24462, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 24505, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 24535, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 24566, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
+   { 24594, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET_EXT */
+   { 24626, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 24662, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 24698, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 24728, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+   { 24758, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 24792, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 24825, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
+   { 24850, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 24879, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
+   { 24908, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 24923, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
+   { 24942, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 24969, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 24989, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 25013, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+   { 25040, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
+   { 25071, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 25093, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 25119, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 25146, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 25177, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 25201, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
+   { 25229, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 25263, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 25283, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 25310, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 25331, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 25356, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 25381, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 25416, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+   { 25465, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+   { 25518, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+   { 25561, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+   { 25608, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+   { 25654, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+   { 25704, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
+   { 25730, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 25752, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 25778, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
+   { 25801, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 25823, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 25849, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+   { 25881, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 25915, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 25953, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 25986, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 26023, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+   { 26053, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 26077, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
+   { 26101, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+   { 26138, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 26159, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
+   { 26175, 0x00008DF4 }, /* GL_MEDIUM_INT */
+   { 26189, 0x00008007 }, /* GL_MIN */
+   { 26196, 0x0000802E }, /* GL_MINMAX */
+   { 26206, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 26220, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 26237, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 26258, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 26273, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 26292, 0x0000821C }, /* GL_MINOR_VERSION */
+   { 26309, 0x00008007 }, /* GL_MIN_EXT */
+   { 26320, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+   { 26348, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET_EXT */
+   { 26380, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 26399, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 26422, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 26445, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 26465, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 26485, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 26515, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 26543, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 26571, 0x00001700 }, /* GL_MODELVIEW */
+   { 26584, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 26602, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 26621, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 26640, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 26659, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 26678, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 26697, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 26716, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 26735, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 26754, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 26773, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 26792, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 26810, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 26829, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 26848, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 26867, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 26886, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 26905, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 26924, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 26943, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 26962, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 26981, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 27000, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 27018, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 27037, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 27056, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 27074, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 27092, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 27110, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 27128, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 27146, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 27164, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 27182, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 27202, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 27244, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 27271, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 27296, 0x00002100 }, /* GL_MODULATE */
+   { 27308, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 27328, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 27355, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 27380, 0x00000103 }, /* GL_MULT */
+   { 27388, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 27403, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 27423, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 27442, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 27461, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 27485, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 27508, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 27538, 0x00002A25 }, /* GL_N3F_V3F */
+   { 27549, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 27569, 0x0000150E }, /* GL_NAND */
+   { 27577, 0x00002600 }, /* GL_NEAREST */
+   { 27588, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 27619, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 27651, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 27676, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 27702, 0x00000200 }, /* GL_NEVER */
+   { 27711, 0x00001102 }, /* GL_NICEST */
+   { 27721, 0x00000000 }, /* GL_NONE */
+   { 27729, 0x00000000 }, /* GL_NONE_OES */
+   { 27741, 0x00001505 }, /* GL_NOOP */
+   { 27749, 0x00001508 }, /* GL_NOR */
+   { 27756, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 27769, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 27785, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 27816, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 27851, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 27875, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 27898, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 27919, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 27933, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 27951, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 27968, 0x00008511 }, /* GL_NORMAL_MAP_OES */
+   { 27986, 0x00000205 }, /* GL_NOTEQUAL */
+   { 27998, 0x00000000 }, /* GL_NO_ERROR */
+   { 28010, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
+   { 28039, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 28073, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 28111, 0x0000821D }, /* GL_NUM_EXTENSIONS */
+   { 28129, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+   { 28159, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 28193, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 28222, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 28254, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 28296, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 28326, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 28366, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 28397, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 28426, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 28454, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 28484, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 28501, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 28527, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 28543, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 28578, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 28600, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 28615, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 28634, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 28664, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 28685, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 28713, 0x00000001 }, /* GL_ONE */
+   { 28720, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 28748, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 28780, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 28808, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 28840, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 28863, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 28886, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 28909, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 28932, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 28950, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 28972, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 28994, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 29010, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 29030, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 29050, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 29068, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 29090, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 29112, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 29128, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 29148, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 29168, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 29186, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 29208, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 29230, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 29246, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 29266, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 29286, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 29307, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 29326, 0x00001507 }, /* GL_OR */
+   { 29332, 0x00000A01 }, /* GL_ORDER */
+   { 29341, 0x0000150D }, /* GL_OR_INVERTED */
+   { 29356, 0x0000150B }, /* GL_OR_REVERSE */
+   { 29370, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 29387, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 29405, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 29426, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 29446, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 29464, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 29483, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 29503, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 29523, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 29541, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 29560, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 29585, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 29609, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 29630, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 29652, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 29674, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 29699, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 29723, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 29744, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 29766, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 29788, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 29810, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 29841, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 29861, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 29886, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 29906, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 29931, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 29951, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 29976, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 29996, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 30021, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 30041, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 30066, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 30086, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 30111, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 30131, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 30156, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 30176, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 30201, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 30221, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 30246, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 30266, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 30291, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 30309, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 30330, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 30359, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 30392, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 30417, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 30440, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 30471, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 30506, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 30533, 0x00001B00 }, /* GL_POINT */
+   { 30542, 0x00000000 }, /* GL_POINTS */
+   { 30552, 0x00000002 }, /* GL_POINT_BIT */
+   { 30565, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 30595, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 30629, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 30663, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 30698, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 30727, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 30760, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 30793, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 30827, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 30841, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 30880, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 30904, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 30936, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 30967, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 30996, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 31022, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 31040, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 31062, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 31084, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 31107, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 31125, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 31147, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 31169, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 31192, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 31212, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 31228, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 31249, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 31265, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 31285, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 31314, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 31333, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 31353, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 31379, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 31394, 0x00000009 }, /* GL_POLYGON */
+   { 31405, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 31420, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 31436, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 31459, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 31484, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 31507, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 31530, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 31554, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 31578, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 31596, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 31619, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 31638, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 31661, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 31678, 0x00001203 }, /* GL_POSITION */
+   { 31690, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 31722, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 31758, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 31791, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 31828, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 31859, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 31894, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 31926, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 31962, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 31995, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 32027, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 32063, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 32096, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 32133, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 32163, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 32197, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 32228, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 32263, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 32294, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 32329, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 32361, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 32397, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 32427, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 32461, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 32492, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 32527, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 32559, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 32590, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 32625, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 32657, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 32693, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 32722, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 32755, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 32785, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 32819, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 32858, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 32891, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 32931, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 32965, 0x00008578 }, /* GL_PREVIOUS */
+   { 32977, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 32993, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 33009, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 33026, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 33047, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 33068, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
+   { 33092, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 33120, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
+   { 33141, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
+   { 33168, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 33198, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 33222, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 33255, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 33287, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 33310, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
+   { 33336, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 33366, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
+   { 33391, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 33420, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+   { 33455, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 33478, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 33508, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 33537, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 33565, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 33587, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 33615, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 33643, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 33665, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 33686, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 33726, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 33765, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 33795, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 33830, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 33863, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 33897, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 33936, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 33975, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 33997, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 34023, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 34047, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
+   { 34069, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 34095, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 34118, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 34140, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 34161, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 34182, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 34209, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 34241, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 34273, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 34308, 0x00001701 }, /* GL_PROJECTION */
+   { 34322, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 34343, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 34386, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 34412, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 34432, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 34456, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 34477, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 34496, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 34519, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 34558, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 34596, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 34616, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
+   { 34642, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 34672, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 34696, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 34716, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
+   { 34742, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 34772, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 34796, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 34816, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 34849, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 34875, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 34905, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
+   { 34932, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 34963, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 34993, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 35012, 0x00002003 }, /* GL_Q */
+   { 35017, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 35042, 0x00000007 }, /* GL_QUADS */
+   { 35051, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 35095, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 35143, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 35160, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 35174, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
+   { 35201, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 35231, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
+   { 35255, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 35282, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 35304, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 35330, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
+   { 35347, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 35367, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 35383, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 35403, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 35429, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 35459, 0x00008E13 }, /* GL_QUERY_WAIT */
+   { 35473, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 35490, 0x00002002 }, /* GL_R */
+   { 35495, 0x00008C3A }, /* GL_R11F_G11F_B10F */
+   { 35513, 0x00008F98 }, /* GL_R16_SNORM */
+   { 35526, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 35538, 0x00008F94 }, /* GL_R8_SNORM */
+   { 35550, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
+   { 35572, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 35598, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 35631, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 35646, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 35666, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 35694, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 35726, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 35750, 0x000088B8 }, /* GL_READ_ONLY */
+   { 35763, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 35780, 0x000088BA }, /* GL_READ_WRITE */
+   { 35794, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 35812, 0x00001903 }, /* GL_RED */
+   { 35819, 0x00008016 }, /* GL_REDUCE */
+   { 35829, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 35843, 0x00000D15 }, /* GL_RED_BIAS */
+   { 35855, 0x00000D52 }, /* GL_RED_BITS */
+   { 35867, 0x00008D94 }, /* GL_RED_INTEGER */
+   { 35882, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
+   { 35901, 0x00000D14 }, /* GL_RED_SCALE */
+   { 35914, 0x00008F90 }, /* GL_RED_SNORM */
+   { 35927, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 35945, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 35967, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 35988, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 36010, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 36028, 0x00001C00 }, /* GL_RENDER */
+   { 36038, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 36054, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 36081, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 36112, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 36136, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 36164, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 36192, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 36218, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 36248, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 36275, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 36306, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 36326, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 36353, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 36384, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 36407, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 36434, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 36461, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 36493, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 36529, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 36565, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 36585, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 36610, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 36639, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 36663, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 36691, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 36720, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 36753, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 36775, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 36801, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 36827, 0x00001F01 }, /* GL_RENDERER */
+   { 36839, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 36854, 0x00002901 }, /* GL_REPEAT */
+   { 36864, 0x00001E01 }, /* GL_REPLACE */
+   { 36875, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 36890, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 36913, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+   { 36949, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 36967, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 36989, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+   { 37024, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 37042, 0x00000102 }, /* GL_RETURN */
+   { 37052, 0x00008F99 }, /* GL_RG16_SNORM */
+   { 37066, 0x00008F95 }, /* GL_RG8_SNORM */
+   { 37079, 0x00001907 }, /* GL_RGB */
+   { 37086, 0x00008052 }, /* GL_RGB10 */
+   { 37095, 0x00008059 }, /* GL_RGB10_A2 */
+   { 37107, 0x0000906F }, /* GL_RGB10_A2UI */
+   { 37121, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 37137, 0x00008052 }, /* GL_RGB10_EXT */
+   { 37150, 0x00008053 }, /* GL_RGB12 */
+   { 37159, 0x00008053 }, /* GL_RGB12_EXT */
+   { 37172, 0x00008054 }, /* GL_RGB16 */
+   { 37181, 0x0000881B }, /* GL_RGB16F */
+   { 37191, 0x00008D89 }, /* GL_RGB16I */
+   { 37201, 0x00008D89 }, /* GL_RGB16I_EXT */
+   { 37215, 0x00008D77 }, /* GL_RGB16UI */
+   { 37226, 0x00008D77 }, /* GL_RGB16UI_EXT */
+   { 37241, 0x00008054 }, /* GL_RGB16_EXT */
+   { 37254, 0x00008F9A }, /* GL_RGB16_SNORM */
+   { 37269, 0x0000804E }, /* GL_RGB2_EXT */
+   { 37281, 0x00008815 }, /* GL_RGB32F */
+   { 37291, 0x00008D83 }, /* GL_RGB32I */
+   { 37301, 0x00008D83 }, /* GL_RGB32I_EXT */
+   { 37315, 0x00008D71 }, /* GL_RGB32UI */
+   { 37326, 0x00008D71 }, /* GL_RGB32UI_EXT */
+   { 37341, 0x0000804F }, /* GL_RGB4 */
+   { 37349, 0x0000804F }, /* GL_RGB4_EXT */
+   { 37361, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 37374, 0x00008050 }, /* GL_RGB5 */
+   { 37382, 0x00008D62 }, /* GL_RGB565 */
+   { 37392, 0x00008D62 }, /* GL_RGB565_OES */
+   { 37406, 0x00008057 }, /* GL_RGB5_A1 */
+   { 37417, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 37432, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 37447, 0x00008050 }, /* GL_RGB5_EXT */
+   { 37459, 0x00008051 }, /* GL_RGB8 */
+   { 37467, 0x00008D8F }, /* GL_RGB8I */
+   { 37476, 0x00008D8F }, /* GL_RGB8I_EXT */
+   { 37489, 0x00008D7D }, /* GL_RGB8UI */
+   { 37499, 0x00008D7D }, /* GL_RGB8UI_EXT */
+   { 37513, 0x00008051 }, /* GL_RGB8_EXT */
+   { 37525, 0x00008051 }, /* GL_RGB8_OES */
+   { 37537, 0x00008F96 }, /* GL_RGB8_SNORM */
+   { 37551, 0x00008C3D }, /* GL_RGB9_E5 */
+   { 37562, 0x00001908 }, /* GL_RGBA */
+   { 37570, 0x0000805A }, /* GL_RGBA12 */
+   { 37580, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 37594, 0x0000805B }, /* GL_RGBA16 */
+   { 37604, 0x0000881A }, /* GL_RGBA16F */
+   { 37615, 0x00008D88 }, /* GL_RGBA16I */
+   { 37626, 0x00008D88 }, /* GL_RGBA16I_EXT */
+   { 37641, 0x00008D76 }, /* GL_RGBA16UI */
+   { 37653, 0x00008D76 }, /* GL_RGBA16UI_EXT */
+   { 37669, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 37683, 0x00008F9B }, /* GL_RGBA16_SNORM */
+   { 37699, 0x00008055 }, /* GL_RGBA2 */
+   { 37708, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 37721, 0x00008814 }, /* GL_RGBA32F */
+   { 37732, 0x00008D82 }, /* GL_RGBA32I */
+   { 37743, 0x00008D82 }, /* GL_RGBA32I_EXT */
+   { 37758, 0x00008D70 }, /* GL_RGBA32UI */
+   { 37770, 0x00008D70 }, /* GL_RGBA32UI_EXT */
+   { 37786, 0x00008056 }, /* GL_RGBA4 */
+   { 37795, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 37814, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 37827, 0x00008056 }, /* GL_RGBA4_OES */
+   { 37840, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 37854, 0x00008058 }, /* GL_RGBA8 */
+   { 37863, 0x00008D8E }, /* GL_RGBA8I */
+   { 37873, 0x00008D8E }, /* GL_RGBA8I_EXT */
+   { 37887, 0x00008D7C }, /* GL_RGBA8UI */
+   { 37898, 0x00008D7C }, /* GL_RGBA8UI_EXT */
+   { 37913, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 37926, 0x00008058 }, /* GL_RGBA8_OES */
+   { 37939, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 37954, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 37972, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
+   { 37995, 0x00008D99 }, /* GL_RGBA_INTEGER */
+   { 38011, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
+   { 38031, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
+   { 38056, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 38069, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 38082, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 38096, 0x00008D98 }, /* GL_RGB_INTEGER */
+   { 38111, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
+   { 38130, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 38142, 0x00008573 }, /* GL_RGB_SCALE */
+   { 38155, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 38172, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 38189, 0x00008F92 }, /* GL_RGB_SNORM */
+   { 38202, 0x00008F91 }, /* GL_RG_SNORM */
+   { 38214, 0x00000407 }, /* GL_RIGHT */
+   { 38223, 0x00002000 }, /* GL_S */
+   { 38228, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 38242, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
+   { 38262, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
+   { 38286, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+   { 38313, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
+   { 38344, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 38365, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 38379, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
+   { 38399, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
+   { 38423, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+   { 38450, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
+   { 38481, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
+   { 38500, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
+   { 38526, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 38547, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 38561, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 38579, 0x00008919 }, /* GL_SAMPLER_BINDING */
+   { 38598, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 38616, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 38638, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 38654, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 38677, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 38704, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
+   { 38728, 0x000080A9 }, /* GL_SAMPLES */
+   { 38739, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 38755, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 38770, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 38788, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 38810, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 38838, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 38870, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 38893, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 38920, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 38938, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 38961, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 38983, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 39002, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 39025, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 39051, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 39081, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 39106, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 39135, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 39150, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 39165, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 39181, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 39206, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 39246, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 39290, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 39323, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 39353, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 39385, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 39415, 0x00001C02 }, /* GL_SELECT */
+   { 39425, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 39453, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 39478, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 39494, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 39514, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 39538, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 39565, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 39596, 0x0000150F }, /* GL_SET */
+   { 39603, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 39628, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 39647, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 39668, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 39692, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 39707, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 39722, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 39750, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 39773, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 39803, 0x00001601 }, /* GL_SHININESS */
+   { 39816, 0x00001402 }, /* GL_SHORT */
+   { 39825, 0x00009119 }, /* GL_SIGNALED */
+   { 39837, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 39858, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 39874, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 39894, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 39913, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 39927, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 39942, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 39964, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 39984, 0x00001D01 }, /* GL_SMOOTH */
+   { 39994, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 40027, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 40054, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 40087, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 40114, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 40131, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 40152, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 40173, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 40188, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 40207, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 40226, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 40243, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 40264, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 40285, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 40300, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 40319, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 40338, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 40355, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 40376, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 40397, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 40412, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 40431, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 40450, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 40470, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 40488, 0x00001202 }, /* GL_SPECULAR */
+   { 40500, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 40514, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 40529, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 40547, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 40564, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 40578, 0x00008580 }, /* GL_SRC0_RGB */
+   { 40590, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 40604, 0x00008581 }, /* GL_SRC1_RGB */
+   { 40616, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 40630, 0x00008582 }, /* GL_SRC2_RGB */
+   { 40642, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 40655, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 40677, 0x00000300 }, /* GL_SRC_COLOR */
+   { 40690, 0x00008C40 }, /* GL_SRGB */
+   { 40698, 0x00008C41 }, /* GL_SRGB8 */
+   { 40707, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 40723, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 40737, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 40755, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 40774, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 40789, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 40808, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 40823, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 40842, 0x000088E5 }, /* GL_STATIC_READ */
+   { 40857, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 40876, 0x00001802 }, /* GL_STENCIL */
+   { 40887, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 40909, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 40935, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 40961, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 40982, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 41007, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 41028, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 41053, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 41085, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 41121, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 41153, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 41189, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 41209, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 41236, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 41262, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 41278, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 41296, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 41318, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 41341, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 41357, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 41373, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 41390, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 41408, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 41427, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 41450, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 41472, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 41494, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 41512, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 41534, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 41556, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 41574, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 41596, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 41618, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 41639, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 41666, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 41693, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 41708, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 41724, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 41753, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 41775, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 41796, 0x00000C33 }, /* GL_STEREO */
+   { 41806, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 41830, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 41855, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 41879, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 41894, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 41913, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 41928, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 41947, 0x000088E1 }, /* GL_STREAM_READ */
+   { 41962, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 41981, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 41998, 0x000084E7 }, /* GL_SUBTRACT */
+   { 42010, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 42026, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 42044, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 42058, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 42072, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 42099, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 42129, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 42144, 0x00002001 }, /* GL_T */
+   { 42149, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 42164, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 42183, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 42199, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 42214, 0x00002A27 }, /* GL_T2F_V3F */
+   { 42225, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 42244, 0x00002A28 }, /* GL_T4F_V4F */
+   { 42255, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 42278, 0x00001702 }, /* GL_TEXTURE */
+   { 42289, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 42301, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 42317, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 42329, 0x000084CA }, /* GL_TEXTURE10 */
+   { 42342, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 42359, 0x000084CB }, /* GL_TEXTURE11 */
+   { 42372, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 42389, 0x000084CC }, /* GL_TEXTURE12 */
+   { 42402, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 42419, 0x000084CD }, /* GL_TEXTURE13 */
+   { 42432, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 42449, 0x000084CE }, /* GL_TEXTURE14 */
+   { 42462, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 42479, 0x000084CF }, /* GL_TEXTURE15 */
+   { 42492, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 42509, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 42522, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 42539, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 42552, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 42569, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 42582, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 42599, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 42612, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 42629, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 42645, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 42657, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 42670, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 42687, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 42700, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 42717, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 42730, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 42747, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 42760, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 42777, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 42790, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 42807, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 42820, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 42837, 0x000084DA }, /* GL_TEXTURE26 */
+   { 42850, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 42867, 0x000084DB }, /* GL_TEXTURE27 */
+   { 42880, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 42897, 0x000084DC }, /* GL_TEXTURE28 */
+   { 42910, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 42927, 0x000084DD }, /* GL_TEXTURE29 */
+   { 42940, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 42957, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 42973, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 42985, 0x000084DE }, /* GL_TEXTURE30 */
+   { 42998, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 43015, 0x000084DF }, /* GL_TEXTURE31 */
+   { 43028, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 43045, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 43061, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 43073, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 43089, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 43101, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 43117, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 43129, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 43145, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 43157, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 43173, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 43185, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 43201, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 43213, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 43229, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 43243, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 43263, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 43287, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 43301, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 43321, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 43345, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 43359, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 43377, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 43399, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 43425, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 43447, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 43469, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 43497, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 43529, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 43551, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 43579, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 43611, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 43633, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 43659, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 43685, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 43715, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 43743, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 43775, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 43807, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+   { 43839, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 43868, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 43901, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 43933, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 43948, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 43969, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 43994, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 44012, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 44036, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 44054, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 44076, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 44113, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 44154, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 44179, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 44208, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 44239, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 44269, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 44299, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 44334, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 44365, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 44403, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 44430, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 44462, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 44496, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 44520, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 44548, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 44572, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 44600, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 44633, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 44657, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 44679, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 44701, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 44727, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 44761, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 44794, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 44831, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 44859, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 44891, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 44914, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 44952, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 44994, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 45025, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 45053, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 45083, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 45111, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 45136, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 45156, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 45180, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 45211, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 45246, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 45281, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 45312, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 45347, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 45382, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 45413, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 45448, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 45483, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 45507, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 45538, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 45573, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 45608, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 45639, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 45674, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 45709, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 45740, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 45775, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 45810, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 45839, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 45856, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 45878, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 45904, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 45919, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 45940, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 45960, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
+   { 45984, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 46010, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 46040, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 46060, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 46084, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 46101, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 46118, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 46135, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 46158, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 46175, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 46200, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 46222, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 46248, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 46266, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 46292, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 46318, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 46348, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 46375, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 46400, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 46420, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 46444, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 46471, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 46498, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 46525, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 46551, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 46581, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 46603, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 46621, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 46661, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 46691, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 46719, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 46747, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 46775, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 46796, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 46815, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 46837, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 46856, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 46876, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 46906, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 46937, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 46958, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 46983, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 47007, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 47027, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 47051, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 47071, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 47094, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 47117, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 47141, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 47169, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 47199, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 47224, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 47258, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 47275, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 47293, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 47315, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 47333, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 47351, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 47370, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 47390, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 47409, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 47438, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 47455, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 47477, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 47507, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 47536, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 47572, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 47609, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 47650, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 47683, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 47717, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 47755, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 47791, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 47825, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 47863, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 47898, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 47937, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 47978, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 48023, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 48054, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 48089, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 48130, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 48175, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 48201, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 48231, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 48263, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 48293, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 48327, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 48343, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 48374, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 48409, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 48437, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 48469, 0x00000004 }, /* GL_TRIANGLES */
+   { 48482, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 48505, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 48532, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 48548, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 48569, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 48587, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 48615, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 48647, 0x00000001 }, /* GL_TRUE */
+   { 48655, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 48674, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+   { 48703, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 48723, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 48746, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 48766, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 48787, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 48809, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 48831, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 48851, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 48872, 0x00009118 }, /* GL_UNSIGNALED */
+   { 48886, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 48903, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 48930, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 48953, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 48969, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 49001, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 49028, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 49059, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 49080, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 49105, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 49129, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 49154, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 49185, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 49220, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 49248, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 49272, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 49300, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 49327, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 49360, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 49397, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 49428, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 49455, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 49488, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 49525, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 49556, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 49588, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 49624, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 49651, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 49682, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 49713, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 49748, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 49777, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 49810, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 49831, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 49856, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 49877, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 49902, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 49923, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 49948, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 49971, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 49989, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 50019, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 50053, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 50079, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 50109, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 50143, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 50169, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 50193, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 50221, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 50249, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 50276, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 50308, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 50339, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 50353, 0x00002A20 }, /* GL_V2F */
+   { 50360, 0x00002A21 }, /* GL_V3F */
+   { 50367, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 50386, 0x00001F00 }, /* GL_VENDOR */
+   { 50396, 0x00001F02 }, /* GL_VERSION */
+   { 50407, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 50423, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 50447, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 50477, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 50508, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 50543, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 50567, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 50588, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 50611, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 50632, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 50659, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 50687, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 50715, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 50743, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 50771, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 50799, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 50827, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 50854, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 50881, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 50908, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 50935, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 50962, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 50989, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 51016, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 51043, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 51070, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 51108, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 51150, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 51185, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 51216, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 51251, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 51282, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 51317, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 51351, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 51389, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 51420, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 51455, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 51483, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 51515, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 51545, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 51579, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 51607, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 51639, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 51659, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 51681, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 51710, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 51731, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 51760, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 51793, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 51825, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 51852, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 51883, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 51913, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 51930, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 51951, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 51978, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 51990, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 52006, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 52024, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 52039, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 52059, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 52090, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 52125, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 52160, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 52180, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 52208, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 52236, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 52261, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 52286, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 52313, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 52340, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 52365, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 52390, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 52414, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 52433, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 52447, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 52465, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 52483, 0x00001506 }, /* GL_XOR */
+   { 52490, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 52509, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 52523, 0x00000000 }, /* GL_ZERO */
+   { 52531, 0x00000D16 }, /* GL_ZOOM_X */
+   { 52541, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1570] =
+static const unsigned reduced_enums[1571] =
 {
-       555, /* GL_FALSE */
-       852, /* GL_LINES */
-       856, /* GL_LINE_LOOP */
-       863, /* GL_LINE_STRIP */
-      2180, /* GL_TRIANGLES */
-      2185, /* GL_TRIANGLE_STRIP */
-      2183, /* GL_TRIANGLE_FAN */
-      1540, /* GL_QUADS */
-      1544, /* GL_QUAD_STRIP */
-      1408, /* GL_POLYGON */
-       853, /* GL_LINES_ADJACENCY */
-       864, /* GL_LINE_STRIP_ADJACENCY */
-      2181, /* GL_TRIANGLES_ADJACENCY */
-      2186, /* GL_TRIANGLE_STRIP_ADJACENCY */
-      1420, /* GL_POLYGON_STIPPLE_BIT */
-      1363, /* GL_PIXEL_MODE_BIT */
-       839, /* GL_LIGHTING_BIT */
-       589, /* GL_FOG_BIT */
+       556, /* GL_FALSE */
+       853, /* GL_LINES */
+       857, /* GL_LINE_LOOP */
+       864, /* GL_LINE_STRIP */
+      2181, /* GL_TRIANGLES */
+      2186, /* GL_TRIANGLE_STRIP */
+      2184, /* GL_TRIANGLE_FAN */
+      1541, /* GL_QUADS */
+      1545, /* GL_QUAD_STRIP */
+      1409, /* GL_POLYGON */
+       854, /* GL_LINES_ADJACENCY */
+       865, /* GL_LINE_STRIP_ADJACENCY */
+      2182, /* GL_TRIANGLES_ADJACENCY */
+      2187, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      1421, /* GL_POLYGON_STIPPLE_BIT */
+      1364, /* GL_PIXEL_MODE_BIT */
+       840, /* GL_LIGHTING_BIT */
+       590, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       875, /* GL_LOAD */
-      1631, /* GL_RETURN */
-      1228, /* GL_MULT */
+       876, /* GL_LOAD */
+      1632, /* GL_RETURN */
+      1229, /* GL_MULT */
         24, /* GL_ADD */
-      1244, /* GL_NEVER */
-       829, /* GL_LESS */
+      1245, /* GL_NEVER */
+       830, /* GL_LESS */
        545, /* GL_EQUAL */
-       828, /* GL_LEQUAL */
-       713, /* GL_GREATER */
-      1261, /* GL_NOTEQUAL */
-       711, /* GL_GEQUAL */
+       829, /* GL_LEQUAL */
+       714, /* GL_GREATER */
+      1262, /* GL_NOTEQUAL */
+       712, /* GL_GEQUAL */
         55, /* GL_ALWAYS */
-      1842, /* GL_SRC_COLOR */
-      1296, /* GL_ONE_MINUS_SRC_COLOR */
-      1840, /* GL_SRC_ALPHA */
-      1295, /* GL_ONE_MINUS_SRC_ALPHA */
+      1843, /* GL_SRC_COLOR */
+      1297, /* GL_ONE_MINUS_SRC_COLOR */
+      1841, /* GL_SRC_ALPHA */
+      1296, /* GL_ONE_MINUS_SRC_ALPHA */
        524, /* GL_DST_ALPHA */
-      1293, /* GL_ONE_MINUS_DST_ALPHA */
+      1294, /* GL_ONE_MINUS_DST_ALPHA */
        525, /* GL_DST_COLOR */
-      1294, /* GL_ONE_MINUS_DST_COLOR */
-      1841, /* GL_SRC_ALPHA_SATURATE */
-       688, /* GL_FRONT_LEFT */
-       689, /* GL_FRONT_RIGHT */
+      1295, /* GL_ONE_MINUS_DST_COLOR */
+      1842, /* GL_SRC_ALPHA_SATURATE */
+       689, /* GL_FRONT_LEFT */
+       690, /* GL_FRONT_RIGHT */
         77, /* GL_BACK_LEFT */
         78, /* GL_BACK_RIGHT */
-       685, /* GL_FRONT */
+       686, /* GL_FRONT */
         76, /* GL_BACK */
-       827, /* GL_LEFT */
-      1722, /* GL_RIGHT */
-       686, /* GL_FRONT_AND_BACK */
+       828, /* GL_LEFT */
+      1723, /* GL_RIGHT */
+       687, /* GL_FRONT_AND_BACK */
         71, /* GL_AUX0 */
         72, /* GL_AUX1 */
         73, /* GL_AUX2 */
         74, /* GL_AUX3 */
-       815, /* GL_INVALID_ENUM */
-       820, /* GL_INVALID_VALUE */
-       819, /* GL_INVALID_OPERATION */
-      1847, /* GL_STACK_OVERFLOW */
-      1848, /* GL_STACK_UNDERFLOW */
-      1321, /* GL_OUT_OF_MEMORY */
-       816, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       816, /* GL_INVALID_ENUM */
+       821, /* GL_INVALID_VALUE */
+       820, /* GL_INVALID_OPERATION */
+      1848, /* GL_STACK_OVERFLOW */
+      1849, /* GL_STACK_UNDERFLOW */
+      1322, /* GL_OUT_OF_MEMORY */
+       817, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1341, /* GL_PASS_THROUGH_TOKEN */
-      1407, /* GL_POINT_TOKEN */
-       866, /* GL_LINE_TOKEN */
-      1421, /* GL_POLYGON_TOKEN */
+      1342, /* GL_PASS_THROUGH_TOKEN */
+      1408, /* GL_POINT_TOKEN */
+       867, /* GL_LINE_TOKEN */
+      1422, /* GL_POLYGON_TOKEN */
         87, /* GL_BITMAP_TOKEN */
        523, /* GL_DRAW_PIXEL_TOKEN */
        353, /* GL_COPY_PIXEL_TOKEN */
-       857, /* GL_LINE_RESET_TOKEN */
-       548, /* GL_EXP */
-       549, /* GL_EXP2 */
+       858, /* GL_LINE_RESET_TOKEN */
+       549, /* GL_EXP */
+       550, /* GL_EXP2 */
        390, /* GL_CW */
        154, /* GL_CCW */
        187, /* GL_COEFF */
-      1318, /* GL_ORDER */
+      1319, /* GL_ORDER */
        444, /* GL_DOMAIN */
        363, /* GL_CURRENT_COLOR */
        366, /* GL_CURRENT_INDEX */
@@ -4817,67 +4819,67 @@ static const unsigned reduced_enums[1570] =
        381, /* GL_CURRENT_RASTER_POSITION */
        382, /* GL_CURRENT_RASTER_POSITION_VALID */
        379, /* GL_CURRENT_RASTER_DISTANCE */
-      1399, /* GL_POINT_SMOOTH */
-      1383, /* GL_POINT_SIZE */
-      1398, /* GL_POINT_SIZE_RANGE */
-      1389, /* GL_POINT_SIZE_GRANULARITY */
-       858, /* GL_LINE_SMOOTH */
-       867, /* GL_LINE_WIDTH */
-       869, /* GL_LINE_WIDTH_RANGE */
-       868, /* GL_LINE_WIDTH_GRANULARITY */
-       860, /* GL_LINE_STIPPLE */
-       861, /* GL_LINE_STIPPLE_PATTERN */
-       862, /* GL_LINE_STIPPLE_REPEAT */
-       874, /* GL_LIST_MODE */
-      1083, /* GL_MAX_LIST_NESTING */
-       871, /* GL_LIST_BASE */
-       873, /* GL_LIST_INDEX */
-      1410, /* GL_POLYGON_MODE */
-      1417, /* GL_POLYGON_SMOOTH */
-      1419, /* GL_POLYGON_STIPPLE */
+      1400, /* GL_POINT_SMOOTH */
+      1384, /* GL_POINT_SIZE */
+      1399, /* GL_POINT_SIZE_RANGE */
+      1390, /* GL_POINT_SIZE_GRANULARITY */
+       859, /* GL_LINE_SMOOTH */
+       868, /* GL_LINE_WIDTH */
+       870, /* GL_LINE_WIDTH_RANGE */
+       869, /* GL_LINE_WIDTH_GRANULARITY */
+       861, /* GL_LINE_STIPPLE */
+       862, /* GL_LINE_STIPPLE_PATTERN */
+       863, /* GL_LINE_STIPPLE_REPEAT */
+       875, /* GL_LIST_MODE */
+      1084, /* GL_MAX_LIST_NESTING */
+       872, /* GL_LIST_BASE */
+       874, /* GL_LIST_INDEX */
+      1411, /* GL_POLYGON_MODE */
+      1418, /* GL_POLYGON_SMOOTH */
+      1420, /* GL_POLYGON_STIPPLE */
        534, /* GL_EDGE_FLAG */
        356, /* GL_CULL_FACE */
        357, /* GL_CULL_FACE_MODE */
-       687, /* GL_FRONT_FACE */
-       838, /* GL_LIGHTING */
-       843, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       844, /* GL_LIGHT_MODEL_TWO_SIDE */
-       840, /* GL_LIGHT_MODEL_AMBIENT */
-      1789, /* GL_SHADE_MODEL */
+       688, /* GL_FRONT_FACE */
+       839, /* GL_LIGHTING */
+       844, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       845, /* GL_LIGHT_MODEL_TWO_SIDE */
+       841, /* GL_LIGHT_MODEL_AMBIENT */
+      1790, /* GL_SHADE_MODEL */
        235, /* GL_COLOR_MATERIAL_FACE */
        236, /* GL_COLOR_MATERIAL_PARAMETER */
        234, /* GL_COLOR_MATERIAL */
-       588, /* GL_FOG */
-       610, /* GL_FOG_INDEX */
-       606, /* GL_FOG_DENSITY */
-       614, /* GL_FOG_START */
-       608, /* GL_FOG_END */
-       611, /* GL_FOG_MODE */
-       590, /* GL_FOG_COLOR */
+       589, /* GL_FOG */
+       611, /* GL_FOG_INDEX */
+       607, /* GL_FOG_DENSITY */
+       615, /* GL_FOG_START */
+       609, /* GL_FOG_END */
+       612, /* GL_FOG_MODE */
+       591, /* GL_FOG_COLOR */
        429, /* GL_DEPTH_RANGE */
        438, /* GL_DEPTH_TEST */
        441, /* GL_DEPTH_WRITEMASK */
        414, /* GL_DEPTH_CLEAR_VALUE */
        428, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1892, /* GL_STENCIL_TEST */
-      1873, /* GL_STENCIL_CLEAR_VALUE */
-      1875, /* GL_STENCIL_FUNC */
-      1894, /* GL_STENCIL_VALUE_MASK */
-      1874, /* GL_STENCIL_FAIL */
-      1889, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1890, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1891, /* GL_STENCIL_REF */
-      1895, /* GL_STENCIL_WRITEMASK */
-      1032, /* GL_MATRIX_MODE */
-      1250, /* GL_NORMALIZE */
-      2313, /* GL_VIEWPORT */
-      1223, /* GL_MODELVIEW_STACK_DEPTH */
-      1514, /* GL_PROJECTION_STACK_DEPTH */
-      2134, /* GL_TEXTURE_STACK_DEPTH */
-      1220, /* GL_MODELVIEW_MATRIX */
-      1512, /* GL_PROJECTION_MATRIX */
-      2114, /* GL_TEXTURE_MATRIX */
+      1893, /* GL_STENCIL_TEST */
+      1874, /* GL_STENCIL_CLEAR_VALUE */
+      1876, /* GL_STENCIL_FUNC */
+      1895, /* GL_STENCIL_VALUE_MASK */
+      1875, /* GL_STENCIL_FAIL */
+      1890, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1891, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1892, /* GL_STENCIL_REF */
+      1896, /* GL_STENCIL_WRITEMASK */
+      1033, /* GL_MATRIX_MODE */
+      1251, /* GL_NORMALIZE */
+      2314, /* GL_VIEWPORT */
+      1224, /* GL_MODELVIEW_STACK_DEPTH */
+      1515, /* GL_PROJECTION_STACK_DEPTH */
+      2135, /* GL_TEXTURE_STACK_DEPTH */
+      1221, /* GL_MODELVIEW_MATRIX */
+      1513, /* GL_PROJECTION_MATRIX */
+      2115, /* GL_TEXTURE_MATRIX */
         69, /* GL_ATTRIB_STACK_DEPTH */
        169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         51, /* GL_ALPHA_TEST */
@@ -4887,267 +4889,267 @@ static const unsigned reduced_enums[1570] =
         91, /* GL_BLEND_DST */
        105, /* GL_BLEND_SRC */
         88, /* GL_BLEND */
-       877, /* GL_LOGIC_OP_MODE */
-       762, /* GL_INDEX_LOGIC_OP */
+       878, /* GL_LOGIC_OP_MODE */
+       763, /* GL_INDEX_LOGIC_OP */
        233, /* GL_COLOR_LOGIC_OP */
         75, /* GL_AUX_BUFFERS */
        454, /* GL_DRAW_BUFFER */
-      1567, /* GL_READ_BUFFER */
-      1766, /* GL_SCISSOR_BOX */
-      1767, /* GL_SCISSOR_TEST */
-       761, /* GL_INDEX_CLEAR_VALUE */
-       766, /* GL_INDEX_WRITEMASK */
+      1568, /* GL_READ_BUFFER */
+      1767, /* GL_SCISSOR_BOX */
+      1768, /* GL_SCISSOR_TEST */
+       762, /* GL_INDEX_CLEAR_VALUE */
+       767, /* GL_INDEX_WRITEMASK */
        230, /* GL_COLOR_CLEAR_VALUE */
        272, /* GL_COLOR_WRITEMASK */
-       763, /* GL_INDEX_MODE */
-      1711, /* GL_RGBA_MODE */
+       764, /* GL_INDEX_MODE */
+      1712, /* GL_RGBA_MODE */
        453, /* GL_DOUBLEBUFFER */
-      1896, /* GL_STEREO */
-      1621, /* GL_RENDER_MODE */
-      1342, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1400, /* GL_POINT_SMOOTH_HINT */
-       859, /* GL_LINE_SMOOTH_HINT */
-      1418, /* GL_POLYGON_SMOOTH_HINT */
-       609, /* GL_FOG_HINT */
-      2094, /* GL_TEXTURE_GEN_S */
-      2096, /* GL_TEXTURE_GEN_T */
-      2093, /* GL_TEXTURE_GEN_R */
-      2092, /* GL_TEXTURE_GEN_Q */
-      1355, /* GL_PIXEL_MAP_I_TO_I */
-      1361, /* GL_PIXEL_MAP_S_TO_S */
-      1357, /* GL_PIXEL_MAP_I_TO_R */
-      1353, /* GL_PIXEL_MAP_I_TO_G */
-      1351, /* GL_PIXEL_MAP_I_TO_B */
-      1349, /* GL_PIXEL_MAP_I_TO_A */
-      1359, /* GL_PIXEL_MAP_R_TO_R */
-      1347, /* GL_PIXEL_MAP_G_TO_G */
-      1345, /* GL_PIXEL_MAP_B_TO_B */
-      1343, /* GL_PIXEL_MAP_A_TO_A */
-      1356, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1362, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1358, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1354, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1352, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1350, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1360, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1348, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1346, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1344, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2198, /* GL_UNPACK_SWAP_BYTES */
-      2193, /* GL_UNPACK_LSB_FIRST */
-      2194, /* GL_UNPACK_ROW_LENGTH */
-      2197, /* GL_UNPACK_SKIP_ROWS */
-      2196, /* GL_UNPACK_SKIP_PIXELS */
-      2191, /* GL_UNPACK_ALIGNMENT */
-      1330, /* GL_PACK_SWAP_BYTES */
-      1325, /* GL_PACK_LSB_FIRST */
-      1326, /* GL_PACK_ROW_LENGTH */
-      1329, /* GL_PACK_SKIP_ROWS */
-      1328, /* GL_PACK_SKIP_PIXELS */
-      1322, /* GL_PACK_ALIGNMENT */
-       973, /* GL_MAP_COLOR */
-       978, /* GL_MAP_STENCIL */
-       765, /* GL_INDEX_SHIFT */
-       764, /* GL_INDEX_OFFSET */
-      1583, /* GL_RED_SCALE */
-      1579, /* GL_RED_BIAS */
-      2339, /* GL_ZOOM_X */
-      2340, /* GL_ZOOM_Y */
-       719, /* GL_GREEN_SCALE */
-       715, /* GL_GREEN_BIAS */
+      1897, /* GL_STEREO */
+      1622, /* GL_RENDER_MODE */
+      1343, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1401, /* GL_POINT_SMOOTH_HINT */
+       860, /* GL_LINE_SMOOTH_HINT */
+      1419, /* GL_POLYGON_SMOOTH_HINT */
+       610, /* GL_FOG_HINT */
+      2095, /* GL_TEXTURE_GEN_S */
+      2097, /* GL_TEXTURE_GEN_T */
+      2094, /* GL_TEXTURE_GEN_R */
+      2093, /* GL_TEXTURE_GEN_Q */
+      1356, /* GL_PIXEL_MAP_I_TO_I */
+      1362, /* GL_PIXEL_MAP_S_TO_S */
+      1358, /* GL_PIXEL_MAP_I_TO_R */
+      1354, /* GL_PIXEL_MAP_I_TO_G */
+      1352, /* GL_PIXEL_MAP_I_TO_B */
+      1350, /* GL_PIXEL_MAP_I_TO_A */
+      1360, /* GL_PIXEL_MAP_R_TO_R */
+      1348, /* GL_PIXEL_MAP_G_TO_G */
+      1346, /* GL_PIXEL_MAP_B_TO_B */
+      1344, /* GL_PIXEL_MAP_A_TO_A */
+      1357, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1363, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1359, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1355, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1353, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1351, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1361, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1349, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1347, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1345, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      2199, /* GL_UNPACK_SWAP_BYTES */
+      2194, /* GL_UNPACK_LSB_FIRST */
+      2195, /* GL_UNPACK_ROW_LENGTH */
+      2198, /* GL_UNPACK_SKIP_ROWS */
+      2197, /* GL_UNPACK_SKIP_PIXELS */
+      2192, /* GL_UNPACK_ALIGNMENT */
+      1331, /* GL_PACK_SWAP_BYTES */
+      1326, /* GL_PACK_LSB_FIRST */
+      1327, /* GL_PACK_ROW_LENGTH */
+      1330, /* GL_PACK_SKIP_ROWS */
+      1329, /* GL_PACK_SKIP_PIXELS */
+      1323, /* GL_PACK_ALIGNMENT */
+       974, /* GL_MAP_COLOR */
+       979, /* GL_MAP_STENCIL */
+       766, /* GL_INDEX_SHIFT */
+       765, /* GL_INDEX_OFFSET */
+      1584, /* GL_RED_SCALE */
+      1580, /* GL_RED_BIAS */
+      2340, /* GL_ZOOM_X */
+      2341, /* GL_ZOOM_Y */
+       720, /* GL_GREEN_SCALE */
+       716, /* GL_GREEN_BIAS */
        115, /* GL_BLUE_SCALE */
        111, /* GL_BLUE_BIAS */
         50, /* GL_ALPHA_SCALE */
         47, /* GL_ALPHA_BIAS */
        430, /* GL_DEPTH_SCALE */
        406, /* GL_DEPTH_BIAS */
-      1065, /* GL_MAX_EVAL_ORDER */
-      1082, /* GL_MAX_LIGHTS */
-      1044, /* GL_MAX_CLIP_DISTANCES */
-      1138, /* GL_MAX_TEXTURE_SIZE */
-      1089, /* GL_MAX_PIXEL_MAP_TABLE */
-      1040, /* GL_MAX_ATTRIB_STACK_DEPTH */
-      1085, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-      1086, /* GL_MAX_NAME_STACK_DEPTH */
-      1117, /* GL_MAX_PROJECTION_STACK_DEPTH */
-      1139, /* GL_MAX_TEXTURE_STACK_DEPTH */
-      1165, /* GL_MAX_VIEWPORT_DIMS */
-      1041, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1906, /* GL_SUBPIXEL_BITS */
-       760, /* GL_INDEX_BITS */
-      1580, /* GL_RED_BITS */
-       716, /* GL_GREEN_BITS */
+      1066, /* GL_MAX_EVAL_ORDER */
+      1083, /* GL_MAX_LIGHTS */
+      1045, /* GL_MAX_CLIP_DISTANCES */
+      1139, /* GL_MAX_TEXTURE_SIZE */
+      1090, /* GL_MAX_PIXEL_MAP_TABLE */
+      1041, /* GL_MAX_ATTRIB_STACK_DEPTH */
+      1086, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+      1087, /* GL_MAX_NAME_STACK_DEPTH */
+      1118, /* GL_MAX_PROJECTION_STACK_DEPTH */
+      1140, /* GL_MAX_TEXTURE_STACK_DEPTH */
+      1166, /* GL_MAX_VIEWPORT_DIMS */
+      1042, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1907, /* GL_SUBPIXEL_BITS */
+       761, /* GL_INDEX_BITS */
+      1581, /* GL_RED_BITS */
+       717, /* GL_GREEN_BITS */
        112, /* GL_BLUE_BITS */
         48, /* GL_ALPHA_BITS */
        407, /* GL_DEPTH_BITS */
-      1870, /* GL_STENCIL_BITS */
+      1871, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1237, /* GL_NAME_STACK_DEPTH */
+      1238, /* GL_NAME_STACK_DEPTH */
         70, /* GL_AUTO_NORMAL */
-       919, /* GL_MAP1_COLOR_4 */
-       922, /* GL_MAP1_INDEX */
-       923, /* GL_MAP1_NORMAL */
-       924, /* GL_MAP1_TEXTURE_COORD_1 */
-       925, /* GL_MAP1_TEXTURE_COORD_2 */
-       926, /* GL_MAP1_TEXTURE_COORD_3 */
-       927, /* GL_MAP1_TEXTURE_COORD_4 */
-       928, /* GL_MAP1_VERTEX_3 */
-       929, /* GL_MAP1_VERTEX_4 */
-       946, /* GL_MAP2_COLOR_4 */
-       949, /* GL_MAP2_INDEX */
-       950, /* GL_MAP2_NORMAL */
-       951, /* GL_MAP2_TEXTURE_COORD_1 */
-       952, /* GL_MAP2_TEXTURE_COORD_2 */
-       953, /* GL_MAP2_TEXTURE_COORD_3 */
-       954, /* GL_MAP2_TEXTURE_COORD_4 */
-       955, /* GL_MAP2_VERTEX_3 */
-       956, /* GL_MAP2_VERTEX_4 */
-       920, /* GL_MAP1_GRID_DOMAIN */
-       921, /* GL_MAP1_GRID_SEGMENTS */
-       947, /* GL_MAP2_GRID_DOMAIN */
-       948, /* GL_MAP2_GRID_SEGMENTS */
-      1989, /* GL_TEXTURE_1D */
-      1992, /* GL_TEXTURE_2D */
-       558, /* GL_FEEDBACK_BUFFER_POINTER */
-       559, /* GL_FEEDBACK_BUFFER_SIZE */
-       560, /* GL_FEEDBACK_BUFFER_TYPE */
-      1776, /* GL_SELECTION_BUFFER_POINTER */
-      1777, /* GL_SELECTION_BUFFER_SIZE */
-      2140, /* GL_TEXTURE_WIDTH */
-      2100, /* GL_TEXTURE_HEIGHT */
-      2043, /* GL_TEXTURE_COMPONENTS */
-      2021, /* GL_TEXTURE_BORDER_COLOR */
-      2020, /* GL_TEXTURE_BORDER */
+       920, /* GL_MAP1_COLOR_4 */
+       923, /* GL_MAP1_INDEX */
+       924, /* GL_MAP1_NORMAL */
+       925, /* GL_MAP1_TEXTURE_COORD_1 */
+       926, /* GL_MAP1_TEXTURE_COORD_2 */
+       927, /* GL_MAP1_TEXTURE_COORD_3 */
+       928, /* GL_MAP1_TEXTURE_COORD_4 */
+       929, /* GL_MAP1_VERTEX_3 */
+       930, /* GL_MAP1_VERTEX_4 */
+       947, /* GL_MAP2_COLOR_4 */
+       950, /* GL_MAP2_INDEX */
+       951, /* GL_MAP2_NORMAL */
+       952, /* GL_MAP2_TEXTURE_COORD_1 */
+       953, /* GL_MAP2_TEXTURE_COORD_2 */
+       954, /* GL_MAP2_TEXTURE_COORD_3 */
+       955, /* GL_MAP2_TEXTURE_COORD_4 */
+       956, /* GL_MAP2_VERTEX_3 */
+       957, /* GL_MAP2_VERTEX_4 */
+       921, /* GL_MAP1_GRID_DOMAIN */
+       922, /* GL_MAP1_GRID_SEGMENTS */
+       948, /* GL_MAP2_GRID_DOMAIN */
+       949, /* GL_MAP2_GRID_SEGMENTS */
+      1990, /* GL_TEXTURE_1D */
+      1993, /* GL_TEXTURE_2D */
+       559, /* GL_FEEDBACK_BUFFER_POINTER */
+       560, /* GL_FEEDBACK_BUFFER_SIZE */
+       561, /* GL_FEEDBACK_BUFFER_TYPE */
+      1777, /* GL_SELECTION_BUFFER_POINTER */
+      1778, /* GL_SELECTION_BUFFER_SIZE */
+      2141, /* GL_TEXTURE_WIDTH */
+      2101, /* GL_TEXTURE_HEIGHT */
+      2044, /* GL_TEXTURE_COMPONENTS */
+      2022, /* GL_TEXTURE_BORDER_COLOR */
+      2021, /* GL_TEXTURE_BORDER */
        445, /* GL_DONT_CARE */
-       556, /* GL_FASTEST */
-      1245, /* GL_NICEST */
+       557, /* GL_FASTEST */
+      1246, /* GL_NICEST */
         56, /* GL_AMBIENT */
        442, /* GL_DIFFUSE */
-      1829, /* GL_SPECULAR */
-      1422, /* GL_POSITION */
-      1832, /* GL_SPOT_DIRECTION */
-      1833, /* GL_SPOT_EXPONENT */
-      1831, /* GL_SPOT_CUTOFF */
+      1830, /* GL_SPECULAR */
+      1423, /* GL_POSITION */
+      1833, /* GL_SPOT_DIRECTION */
+      1834, /* GL_SPOT_EXPONENT */
+      1832, /* GL_SPOT_CUTOFF */
        320, /* GL_CONSTANT_ATTENUATION */
-       847, /* GL_LINEAR_ATTENUATION */
-      1539, /* GL_QUADRATIC_ATTENUATION */
+       848, /* GL_LINEAR_ATTENUATION */
+      1540, /* GL_QUADRATIC_ATTENUATION */
        287, /* GL_COMPILE */
        288, /* GL_COMPILE_AND_EXECUTE */
        149, /* GL_BYTE */
-      2200, /* GL_UNSIGNED_BYTE */
-      1794, /* GL_SHORT */
-      2239, /* GL_UNSIGNED_SHORT */
-       769, /* GL_INT */
-      2203, /* GL_UNSIGNED_INT */
-       569, /* GL_FLOAT */
+      2201, /* GL_UNSIGNED_BYTE */
+      1795, /* GL_SHORT */
+      2240, /* GL_UNSIGNED_SHORT */
+       770, /* GL_INT */
+      2204, /* GL_UNSIGNED_INT */
+       570, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
        452, /* GL_DOUBLE */
-       721, /* GL_HALF_FLOAT */
-       564, /* GL_FIXED */
+       722, /* GL_HALF_FLOAT */
+       565, /* GL_FIXED */
        165, /* GL_CLEAR */
         58, /* GL_AND */
         60, /* GL_AND_REVERSE */
        351, /* GL_COPY */
         59, /* GL_AND_INVERTED */
-      1248, /* GL_NOOP */
-      2335, /* GL_XOR */
-      1317, /* GL_OR */
-      1249, /* GL_NOR */
+      1249, /* GL_NOOP */
+      2336, /* GL_XOR */
+      1318, /* GL_OR */
+      1250, /* GL_NOR */
        546, /* GL_EQUIV */
-       823, /* GL_INVERT */
-      1320, /* GL_OR_REVERSE */
+       824, /* GL_INVERT */
+      1321, /* GL_OR_REVERSE */
        352, /* GL_COPY_INVERTED */
-      1319, /* GL_OR_INVERTED */
-      1238, /* GL_NAND */
-      1783, /* GL_SET */
+      1320, /* GL_OR_INVERTED */
+      1239, /* GL_NAND */
+      1784, /* GL_SET */
        543, /* GL_EMISSION */
-      1793, /* GL_SHININESS */
+      1794, /* GL_SHININESS */
         57, /* GL_AMBIENT_AND_DIFFUSE */
        232, /* GL_COLOR_INDEXES */
-      1187, /* GL_MODELVIEW */
-      1511, /* GL_PROJECTION */
-      1924, /* GL_TEXTURE */
+      1188, /* GL_MODELVIEW */
+      1512, /* GL_PROJECTION */
+      1925, /* GL_TEXTURE */
        188, /* GL_COLOR */
        399, /* GL_DEPTH */
-      1855, /* GL_STENCIL */
+      1856, /* GL_STENCIL */
        231, /* GL_COLOR_INDEX */
-      1876, /* GL_STENCIL_INDEX */
+      1877, /* GL_STENCIL_INDEX */
        415, /* GL_DEPTH_COMPONENT */
-      1576, /* GL_RED */
-       714, /* GL_GREEN */
+      1577, /* GL_RED */
+       715, /* GL_GREEN */
        110, /* GL_BLUE */
         32, /* GL_ALPHA */
-      1634, /* GL_RGB */
-      1675, /* GL_RGBA */
-       882, /* GL_LUMINANCE */
-       909, /* GL_LUMINANCE_ALPHA */
+      1635, /* GL_RGB */
+      1676, /* GL_RGBA */
+       883, /* GL_LUMINANCE */
+       910, /* GL_LUMINANCE_ALPHA */
         86, /* GL_BITMAP */
-      1372, /* GL_POINT */
-       845, /* GL_LINE */
-       561, /* GL_FILL */
-      1590, /* GL_RENDER */
-       557, /* GL_FEEDBACK */
-      1775, /* GL_SELECT */
-       568, /* GL_FLAT */
-      1804, /* GL_SMOOTH */
-       824, /* GL_KEEP */
-      1623, /* GL_REPLACE */
-       750, /* GL_INCR */
+      1373, /* GL_POINT */
+       846, /* GL_LINE */
+       562, /* GL_FILL */
+      1591, /* GL_RENDER */
+       558, /* GL_FEEDBACK */
+      1776, /* GL_SELECT */
+       569, /* GL_FLAT */
+      1805, /* GL_SMOOTH */
+       825, /* GL_KEEP */
+      1624, /* GL_REPLACE */
+       751, /* GL_INCR */
        395, /* GL_DECR */
-      2256, /* GL_VENDOR */
-      1620, /* GL_RENDERER */
-      2257, /* GL_VERSION */
-       550, /* GL_EXTENSIONS */
-      1723, /* GL_S */
-      1915, /* GL_T */
-      1559, /* GL_R */
-      1538, /* GL_Q */
-      1224, /* GL_MODULATE */
+      2257, /* GL_VENDOR */
+      1621, /* GL_RENDERER */
+      2258, /* GL_VERSION */
+       551, /* GL_EXTENSIONS */
+      1724, /* GL_S */
+      1916, /* GL_T */
+      1560, /* GL_R */
+      1539, /* GL_Q */
+      1225, /* GL_MODULATE */
        394, /* GL_DECAL */
-      2086, /* GL_TEXTURE_ENV_MODE */
-      2085, /* GL_TEXTURE_ENV_COLOR */
-      2084, /* GL_TEXTURE_ENV */
-       551, /* GL_EYE_LINEAR */
-      1278, /* GL_OBJECT_LINEAR */
-      1830, /* GL_SPHERE_MAP */
-      2090, /* GL_TEXTURE_GEN_MODE */
-      1280, /* GL_OBJECT_PLANE */
-       552, /* GL_EYE_PLANE */
-      1239, /* GL_NEAREST */
-       846, /* GL_LINEAR */
-      1243, /* GL_NEAREST_MIPMAP_NEAREST */
-       851, /* GL_LINEAR_MIPMAP_NEAREST */
-      1242, /* GL_NEAREST_MIPMAP_LINEAR */
-       850, /* GL_LINEAR_MIPMAP_LINEAR */
-      2113, /* GL_TEXTURE_MAG_FILTER */
-      2122, /* GL_TEXTURE_MIN_FILTER */
-      2143, /* GL_TEXTURE_WRAP_S */
-      2144, /* GL_TEXTURE_WRAP_T */
+      2087, /* GL_TEXTURE_ENV_MODE */
+      2086, /* GL_TEXTURE_ENV_COLOR */
+      2085, /* GL_TEXTURE_ENV */
+       552, /* GL_EYE_LINEAR */
+      1279, /* GL_OBJECT_LINEAR */
+      1831, /* GL_SPHERE_MAP */
+      2091, /* GL_TEXTURE_GEN_MODE */
+      1281, /* GL_OBJECT_PLANE */
+       553, /* GL_EYE_PLANE */
+      1240, /* GL_NEAREST */
+       847, /* GL_LINEAR */
+      1244, /* GL_NEAREST_MIPMAP_NEAREST */
+       852, /* GL_LINEAR_MIPMAP_NEAREST */
+      1243, /* GL_NEAREST_MIPMAP_LINEAR */
+       851, /* GL_LINEAR_MIPMAP_LINEAR */
+      2114, /* GL_TEXTURE_MAG_FILTER */
+      2123, /* GL_TEXTURE_MIN_FILTER */
+      2144, /* GL_TEXTURE_WRAP_S */
+      2145, /* GL_TEXTURE_WRAP_T */
        155, /* GL_CLAMP */
-      1622, /* GL_REPEAT */
-      1416, /* GL_POLYGON_OFFSET_UNITS */
-      1415, /* GL_POLYGON_OFFSET_POINT */
-      1414, /* GL_POLYGON_OFFSET_LINE */
-      1562, /* GL_R3_G3_B2 */
-      2253, /* GL_V2F */
-      2254, /* GL_V3F */
+      1623, /* GL_REPEAT */
+      1417, /* GL_POLYGON_OFFSET_UNITS */
+      1416, /* GL_POLYGON_OFFSET_POINT */
+      1415, /* GL_POLYGON_OFFSET_LINE */
+      1563, /* GL_R3_G3_B2 */
+      2254, /* GL_V2F */
+      2255, /* GL_V3F */
        152, /* GL_C4UB_V2F */
        153, /* GL_C4UB_V3F */
        150, /* GL_C3F_V3F */
-      1236, /* GL_N3F_V3F */
+      1237, /* GL_N3F_V3F */
        151, /* GL_C4F_N3F_V3F */
-      1920, /* GL_T2F_V3F */
-      1922, /* GL_T4F_V4F */
-      1918, /* GL_T2F_C4UB_V3F */
-      1916, /* GL_T2F_C3F_V3F */
-      1919, /* GL_T2F_N3F_V3F */
-      1917, /* GL_T2F_C4F_N3F_V3F */
-      1921, /* GL_T4F_C4F_N3F_V4F */
+      1921, /* GL_T2F_V3F */
+      1923, /* GL_T4F_V4F */
+      1919, /* GL_T2F_C4UB_V3F */
+      1917, /* GL_T2F_C3F_V3F */
+      1920, /* GL_T2F_N3F_V3F */
+      1918, /* GL_T2F_C4F_N3F_V3F */
+      1922, /* GL_T4F_C4F_N3F_V4F */
        172, /* GL_CLIP_DISTANCE0 */
        173, /* GL_CLIP_DISTANCE1 */
        174, /* GL_CLIP_DISTANCE2 */
@@ -5156,184 +5158,184 @@ static const unsigned reduced_enums[1570] =
        177, /* GL_CLIP_DISTANCE5 */
        178, /* GL_CLIP_DISTANCE6 */
        179, /* GL_CLIP_DISTANCE7 */
-       830, /* GL_LIGHT0 */
-       831, /* GL_LIGHT1 */
-       832, /* GL_LIGHT2 */
-       833, /* GL_LIGHT3 */
-       834, /* GL_LIGHT4 */
-       835, /* GL_LIGHT5 */
-       836, /* GL_LIGHT6 */
-       837, /* GL_LIGHT7 */
-       725, /* GL_HINT_BIT */
+       831, /* GL_LIGHT0 */
+       832, /* GL_LIGHT1 */
+       833, /* GL_LIGHT2 */
+       834, /* GL_LIGHT3 */
+       835, /* GL_LIGHT4 */
+       836, /* GL_LIGHT5 */
+       837, /* GL_LIGHT6 */
+       838, /* GL_LIGHT7 */
+       726, /* GL_HINT_BIT */
        322, /* GL_CONSTANT_COLOR */
-      1291, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1292, /* GL_ONE_MINUS_CONSTANT_COLOR */
        317, /* GL_CONSTANT_ALPHA */
-      1289, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1290, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         89, /* GL_BLEND_COLOR */
-       690, /* GL_FUNC_ADD */
-      1168, /* GL_MIN */
-      1035, /* GL_MAX */
+       691, /* GL_FUNC_ADD */
+      1169, /* GL_MIN */
+      1036, /* GL_MAX */
         96, /* GL_BLEND_EQUATION */
-       696, /* GL_FUNC_SUBTRACT */
-       693, /* GL_FUNC_REVERSE_SUBTRACT */
+       697, /* GL_FUNC_SUBTRACT */
+       694, /* GL_FUNC_REVERSE_SUBTRACT */
        331, /* GL_CONVOLUTION_1D */
        332, /* GL_CONVOLUTION_2D */
-      1778, /* GL_SEPARABLE_2D */
+      1779, /* GL_SEPARABLE_2D */
        335, /* GL_CONVOLUTION_BORDER_MODE */
        339, /* GL_CONVOLUTION_FILTER_SCALE */
        337, /* GL_CONVOLUTION_FILTER_BIAS */
-      1577, /* GL_REDUCE */
+      1578, /* GL_REDUCE */
        341, /* GL_CONVOLUTION_FORMAT */
        345, /* GL_CONVOLUTION_WIDTH */
        343, /* GL_CONVOLUTION_HEIGHT */
-      1054, /* GL_MAX_CONVOLUTION_WIDTH */
-      1052, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1455, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1451, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1446, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1442, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1453, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1449, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1444, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1440, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       726, /* GL_HISTOGRAM */
-      1518, /* GL_PROXY_HISTOGRAM */
-       742, /* GL_HISTOGRAM_WIDTH */
-       732, /* GL_HISTOGRAM_FORMAT */
-       738, /* GL_HISTOGRAM_RED_SIZE */
-       734, /* GL_HISTOGRAM_GREEN_SIZE */
-       729, /* GL_HISTOGRAM_BLUE_SIZE */
-       727, /* GL_HISTOGRAM_ALPHA_SIZE */
-       736, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       740, /* GL_HISTOGRAM_SINK */
-      1169, /* GL_MINMAX */
-      1171, /* GL_MINMAX_FORMAT */
-      1173, /* GL_MINMAX_SINK */
-      1923, /* GL_TABLE_TOO_LARGE_EXT */
-      2202, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2242, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2245, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2214, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2205, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1413, /* GL_POLYGON_OFFSET_FILL */
-      1412, /* GL_POLYGON_OFFSET_FACTOR */
-      1411, /* GL_POLYGON_OFFSET_BIAS */
-      1627, /* GL_RESCALE_NORMAL */
+      1055, /* GL_MAX_CONVOLUTION_WIDTH */
+      1053, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1456, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1452, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1447, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1443, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1454, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1450, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1445, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1441, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       727, /* GL_HISTOGRAM */
+      1519, /* GL_PROXY_HISTOGRAM */
+       743, /* GL_HISTOGRAM_WIDTH */
+       733, /* GL_HISTOGRAM_FORMAT */
+       739, /* GL_HISTOGRAM_RED_SIZE */
+       735, /* GL_HISTOGRAM_GREEN_SIZE */
+       730, /* GL_HISTOGRAM_BLUE_SIZE */
+       728, /* GL_HISTOGRAM_ALPHA_SIZE */
+       737, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       741, /* GL_HISTOGRAM_SINK */
+      1170, /* GL_MINMAX */
+      1172, /* GL_MINMAX_FORMAT */
+      1174, /* GL_MINMAX_SINK */
+      1924, /* GL_TABLE_TOO_LARGE_EXT */
+      2203, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2243, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2246, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2215, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2206, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1414, /* GL_POLYGON_OFFSET_FILL */
+      1413, /* GL_POLYGON_OFFSET_FACTOR */
+      1412, /* GL_POLYGON_OFFSET_BIAS */
+      1628, /* GL_RESCALE_NORMAL */
         41, /* GL_ALPHA4 */
         43, /* GL_ALPHA8 */
         33, /* GL_ALPHA12 */
         35, /* GL_ALPHA16 */
-       897, /* GL_LUMINANCE4 */
-       903, /* GL_LUMINANCE8 */
-       883, /* GL_LUMINANCE12 */
-       889, /* GL_LUMINANCE16 */
-       898, /* GL_LUMINANCE4_ALPHA4 */
-       901, /* GL_LUMINANCE6_ALPHA2 */
-       906, /* GL_LUMINANCE8_ALPHA8 */
-       886, /* GL_LUMINANCE12_ALPHA4 */
-       884, /* GL_LUMINANCE12_ALPHA12 */
-       892, /* GL_LUMINANCE16_ALPHA16 */
-       770, /* GL_INTENSITY */
-       779, /* GL_INTENSITY4 */
-       781, /* GL_INTENSITY8 */
-       771, /* GL_INTENSITY12 */
-       773, /* GL_INTENSITY16 */
-      1650, /* GL_RGB2_EXT */
-      1656, /* GL_RGB4 */
-      1659, /* GL_RGB5 */
-      1666, /* GL_RGB8 */
-      1635, /* GL_RGB10 */
-      1640, /* GL_RGB12 */
-      1642, /* GL_RGB16 */
-      1686, /* GL_RGBA2 */
-      1693, /* GL_RGBA4 */
-      1662, /* GL_RGB5_A1 */
-      1698, /* GL_RGBA8 */
-      1636, /* GL_RGB10_A2 */
-      1676, /* GL_RGBA12 */
-      1678, /* GL_RGBA16 */
-      2130, /* GL_TEXTURE_RED_SIZE */
-      2098, /* GL_TEXTURE_GREEN_SIZE */
-      2018, /* GL_TEXTURE_BLUE_SIZE */
-      1997, /* GL_TEXTURE_ALPHA_SIZE */
-      2111, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2102, /* GL_TEXTURE_INTENSITY_SIZE */
-      1624, /* GL_REPLACE_EXT */
-      1522, /* GL_PROXY_TEXTURE_1D */
-      1526, /* GL_PROXY_TEXTURE_2D */
-      2138, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2124, /* GL_TEXTURE_PRIORITY */
-      2132, /* GL_TEXTURE_RESIDENT */
-      2000, /* GL_TEXTURE_BINDING_1D */
-      2003, /* GL_TEXTURE_BINDING_2D */
-      2006, /* GL_TEXTURE_BINDING_3D */
-      1327, /* GL_PACK_SKIP_IMAGES */
-      1323, /* GL_PACK_IMAGE_HEIGHT */
-      2195, /* GL_UNPACK_SKIP_IMAGES */
-      2192, /* GL_UNPACK_IMAGE_HEIGHT */
-      1995, /* GL_TEXTURE_3D */
-      1530, /* GL_PROXY_TEXTURE_3D */
-      2081, /* GL_TEXTURE_DEPTH */
-      2141, /* GL_TEXTURE_WRAP_R */
-      1036, /* GL_MAX_3D_TEXTURE_SIZE */
-      2258, /* GL_VERTEX_ARRAY */
-      1251, /* GL_NORMAL_ARRAY */
+       898, /* GL_LUMINANCE4 */
+       904, /* GL_LUMINANCE8 */
+       884, /* GL_LUMINANCE12 */
+       890, /* GL_LUMINANCE16 */
+       899, /* GL_LUMINANCE4_ALPHA4 */
+       902, /* GL_LUMINANCE6_ALPHA2 */
+       907, /* GL_LUMINANCE8_ALPHA8 */
+       887, /* GL_LUMINANCE12_ALPHA4 */
+       885, /* GL_LUMINANCE12_ALPHA12 */
+       893, /* GL_LUMINANCE16_ALPHA16 */
+       771, /* GL_INTENSITY */
+       780, /* GL_INTENSITY4 */
+       782, /* GL_INTENSITY8 */
+       772, /* GL_INTENSITY12 */
+       774, /* GL_INTENSITY16 */
+      1651, /* GL_RGB2_EXT */
+      1657, /* GL_RGB4 */
+      1660, /* GL_RGB5 */
+      1667, /* GL_RGB8 */
+      1636, /* GL_RGB10 */
+      1641, /* GL_RGB12 */
+      1643, /* GL_RGB16 */
+      1687, /* GL_RGBA2 */
+      1694, /* GL_RGBA4 */
+      1663, /* GL_RGB5_A1 */
+      1699, /* GL_RGBA8 */
+      1637, /* GL_RGB10_A2 */
+      1677, /* GL_RGBA12 */
+      1679, /* GL_RGBA16 */
+      2131, /* GL_TEXTURE_RED_SIZE */
+      2099, /* GL_TEXTURE_GREEN_SIZE */
+      2019, /* GL_TEXTURE_BLUE_SIZE */
+      1998, /* GL_TEXTURE_ALPHA_SIZE */
+      2112, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2103, /* GL_TEXTURE_INTENSITY_SIZE */
+      1625, /* GL_REPLACE_EXT */
+      1523, /* GL_PROXY_TEXTURE_1D */
+      1527, /* GL_PROXY_TEXTURE_2D */
+      2139, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2125, /* GL_TEXTURE_PRIORITY */
+      2133, /* GL_TEXTURE_RESIDENT */
+      2001, /* GL_TEXTURE_BINDING_1D */
+      2004, /* GL_TEXTURE_BINDING_2D */
+      2007, /* GL_TEXTURE_BINDING_3D */
+      1328, /* GL_PACK_SKIP_IMAGES */
+      1324, /* GL_PACK_IMAGE_HEIGHT */
+      2196, /* GL_UNPACK_SKIP_IMAGES */
+      2193, /* GL_UNPACK_IMAGE_HEIGHT */
+      1996, /* GL_TEXTURE_3D */
+      1531, /* GL_PROXY_TEXTURE_3D */
+      2082, /* GL_TEXTURE_DEPTH */
+      2142, /* GL_TEXTURE_WRAP_R */
+      1037, /* GL_MAX_3D_TEXTURE_SIZE */
+      2259, /* GL_VERTEX_ARRAY */
+      1252, /* GL_NORMAL_ARRAY */
        189, /* GL_COLOR_ARRAY */
-       754, /* GL_INDEX_ARRAY */
-      2051, /* GL_TEXTURE_COORD_ARRAY */
+       755, /* GL_INDEX_ARRAY */
+      2052, /* GL_TEXTURE_COORD_ARRAY */
        535, /* GL_EDGE_FLAG_ARRAY */
-      2264, /* GL_VERTEX_ARRAY_SIZE */
-      2266, /* GL_VERTEX_ARRAY_TYPE */
-      2265, /* GL_VERTEX_ARRAY_STRIDE */
-      1256, /* GL_NORMAL_ARRAY_TYPE */
-      1255, /* GL_NORMAL_ARRAY_STRIDE */
+      2265, /* GL_VERTEX_ARRAY_SIZE */
+      2267, /* GL_VERTEX_ARRAY_TYPE */
+      2266, /* GL_VERTEX_ARRAY_STRIDE */
+      1257, /* GL_NORMAL_ARRAY_TYPE */
+      1256, /* GL_NORMAL_ARRAY_STRIDE */
        193, /* GL_COLOR_ARRAY_SIZE */
        195, /* GL_COLOR_ARRAY_TYPE */
        194, /* GL_COLOR_ARRAY_STRIDE */
-       759, /* GL_INDEX_ARRAY_TYPE */
-       758, /* GL_INDEX_ARRAY_STRIDE */
-      2055, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2057, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2056, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       760, /* GL_INDEX_ARRAY_TYPE */
+       759, /* GL_INDEX_ARRAY_STRIDE */
+      2056, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2058, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2057, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        539, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2263, /* GL_VERTEX_ARRAY_POINTER */
-      1254, /* GL_NORMAL_ARRAY_POINTER */
+      2264, /* GL_VERTEX_ARRAY_POINTER */
+      1255, /* GL_NORMAL_ARRAY_POINTER */
        192, /* GL_COLOR_ARRAY_POINTER */
-       757, /* GL_INDEX_ARRAY_POINTER */
-      2054, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       758, /* GL_INDEX_ARRAY_POINTER */
+      2055, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        538, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1229, /* GL_MULTISAMPLE */
-      1752, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1754, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1759, /* GL_SAMPLE_COVERAGE */
-      1756, /* GL_SAMPLE_BUFFERS */
-      1747, /* GL_SAMPLES */
-      1763, /* GL_SAMPLE_COVERAGE_VALUE */
-      1761, /* GL_SAMPLE_COVERAGE_INVERT */
+      1230, /* GL_MULTISAMPLE */
+      1753, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1755, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1760, /* GL_SAMPLE_COVERAGE */
+      1757, /* GL_SAMPLE_BUFFERS */
+      1748, /* GL_SAMPLES */
+      1764, /* GL_SAMPLE_COVERAGE_VALUE */
+      1762, /* GL_SAMPLE_COVERAGE_INVERT */
        237, /* GL_COLOR_MATRIX */
        239, /* GL_COLOR_MATRIX_STACK_DEPTH */
-      1048, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1438, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1434, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1429, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1425, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1436, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1432, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1427, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1423, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      2034, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1531, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      2036, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1049, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1439, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1435, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1430, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1426, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1437, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1433, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1428, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1424, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      2035, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1532, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      2037, /* 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 */
-      1448, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1431, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1517, /* GL_PROXY_COLOR_TABLE */
-      1521, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1520, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1449, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1432, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1518, /* GL_PROXY_COLOR_TABLE */
+      1522, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1521, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        267, /* GL_COLOR_TABLE_SCALE */
        247, /* GL_COLOR_TABLE_BIAS */
        252, /* GL_COLOR_TABLE_FORMAT */
@@ -5346,398 +5348,398 @@ static const unsigned reduced_enums[1570] =
        258, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         79, /* GL_BGR */
         80, /* GL_BGRA */
-      1064, /* GL_MAX_ELEMENTS_VERTICES */
-      1063, /* GL_MAX_ELEMENTS_INDICES */
-      2101, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      1065, /* GL_MAX_ELEMENTS_VERTICES */
+      1064, /* GL_MAX_ELEMENTS_INDICES */
+      2102, /* GL_TEXTURE_INDEX_SIZE_EXT */
        186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1394, /* GL_POINT_SIZE_MIN */
-      1390, /* GL_POINT_SIZE_MAX */
-      1379, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1375, /* GL_POINT_DISTANCE_ATTENUATION */
+      1395, /* GL_POINT_SIZE_MIN */
+      1391, /* GL_POINT_SIZE_MAX */
+      1380, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1376, /* GL_POINT_DISTANCE_ATTENUATION */
        159, /* GL_CLAMP_TO_BORDER */
        162, /* GL_CLAMP_TO_EDGE */
-      2123, /* GL_TEXTURE_MIN_LOD */
-      2121, /* GL_TEXTURE_MAX_LOD */
-      1999, /* GL_TEXTURE_BASE_LEVEL */
-      2120, /* GL_TEXTURE_MAX_LEVEL */
-       745, /* GL_IGNORE_BORDER_HP */
+      2124, /* GL_TEXTURE_MIN_LOD */
+      2122, /* GL_TEXTURE_MAX_LOD */
+      2000, /* GL_TEXTURE_BASE_LEVEL */
+      2121, /* GL_TEXTURE_MAX_LEVEL */
+       746, /* GL_IGNORE_BORDER_HP */
        321, /* GL_CONSTANT_BORDER_HP */
-      1625, /* GL_REPLICATE_BORDER_HP */
+      1626, /* GL_REPLICATE_BORDER_HP */
        333, /* GL_CONVOLUTION_BORDER_COLOR */
-      1286, /* GL_OCCLUSION_TEST_HP */
-      1287, /* GL_OCCLUSION_TEST_RESULT_HP */
-       848, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      2028, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      2030, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      2032, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      2033, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      2031, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      2029, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-      1042, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-      1043, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1458, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1460, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1457, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1459, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2109, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2110, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2108, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       699, /* GL_GENERATE_MIPMAP */
-       700, /* GL_GENERATE_MIPMAP_HINT */
-       612, /* GL_FOG_OFFSET_SGIX */
-       613, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2042, /* GL_TEXTURE_COMPARE_SGIX */
-      2041, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2105, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2097, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      1287, /* GL_OCCLUSION_TEST_HP */
+      1288, /* GL_OCCLUSION_TEST_RESULT_HP */
+       849, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      2029, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      2031, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      2033, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      2034, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      2032, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      2030, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1043, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+      1044, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1459, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1461, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1458, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1460, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      2110, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2111, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2109, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       700, /* GL_GENERATE_MIPMAP */
+       701, /* GL_GENERATE_MIPMAP_HINT */
+       613, /* GL_FOG_OFFSET_SGIX */
+       614, /* GL_FOG_OFFSET_VALUE_SGIX */
+      2043, /* GL_TEXTURE_COMPARE_SGIX */
+      2042, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2106, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2098, /* GL_TEXTURE_GEQUAL_R_SGIX */
        416, /* GL_DEPTH_COMPONENT16 */
        420, /* GL_DEPTH_COMPONENT24 */
        424, /* GL_DEPTH_COMPONENT32 */
        358, /* GL_CULL_VERTEX_EXT */
        360, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        359, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2331, /* GL_WRAP_BORDER_SUN */
-      2035, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       841, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1797, /* GL_SINGLE_COLOR */
-      1781, /* GL_SEPARATE_SPECULAR_COLOR */
-      1792, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       624, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       625, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       636, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       627, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       623, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       622, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       626, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       637, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       654, /* GL_FRAMEBUFFER_DEFAULT */
-       681, /* GL_FRAMEBUFFER_UNDEFINED */
+      2332, /* GL_WRAP_BORDER_SUN */
+      2036, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       842, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1798, /* GL_SINGLE_COLOR */
+      1782, /* GL_SEPARATE_SPECULAR_COLOR */
+      1793, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       625, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       626, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       637, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       628, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       624, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       623, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       627, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       638, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       655, /* GL_FRAMEBUFFER_DEFAULT */
+       682, /* GL_FRAMEBUFFER_UNDEFINED */
        432, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       918, /* GL_MAJOR_VERSION */
-      1175, /* GL_MINOR_VERSION */
-      1266, /* GL_NUM_EXTENSIONS */
+       919, /* GL_MAJOR_VERSION */
+      1176, /* GL_MINOR_VERSION */
+      1267, /* GL_NUM_EXTENSIONS */
        327, /* GL_CONTEXT_FLAGS */
-       753, /* GL_INDEX */
+       754, /* GL_INDEX */
        410, /* GL_DEPTH_BUFFER */
-      1871, /* GL_STENCIL_BUFFER */
+      1872, /* GL_STENCIL_BUFFER */
        298, /* GL_COMPRESSED_RED */
        299, /* GL_COMPRESSED_RG */
-       878, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
-       720, /* GL_GUILTY_CONTEXT_RESET_ARB */
-       768, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-      2190, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-      1629, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-      1480, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-      1263, /* GL_NO_RESET_NOTIFICATION_ARB */
-      2201, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2246, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2247, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2243, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2240, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2215, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2211, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2118, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2119, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2117, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-      1179, /* GL_MIRRORED_REPEAT */
-      1716, /* GL_RGB_S3TC */
-      1658, /* GL_RGB4_S3TC */
-      1712, /* GL_RGBA_S3TC */
-      1697, /* GL_RGBA4_S3TC */
-      1706, /* GL_RGBA_DXT5_S3TC */
-      1694, /* GL_RGBA4_DXT5_S3TC */
+       879, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
+       721, /* GL_GUILTY_CONTEXT_RESET_ARB */
+       769, /* GL_INNOCENT_CONTEXT_RESET_ARB */
+      2191, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+      1630, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+      1481, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+      1264, /* GL_NO_RESET_NOTIFICATION_ARB */
+      2202, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2247, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2248, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2244, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2241, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2216, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2212, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2119, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2120, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2118, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1180, /* GL_MIRRORED_REPEAT */
+      1717, /* GL_RGB_S3TC */
+      1659, /* GL_RGB4_S3TC */
+      1713, /* GL_RGBA_S3TC */
+      1698, /* GL_RGBA4_S3TC */
+      1707, /* GL_RGBA_DXT5_S3TC */
+      1695, /* 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 */
-      1241, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1240, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       849, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       599, /* GL_FOG_COORDINATE_SOURCE */
-       591, /* GL_FOG_COORD */
-       615, /* GL_FRAGMENT_DEPTH */
+      1242, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1241, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       850, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       600, /* GL_FOG_COORDINATE_SOURCE */
+       592, /* GL_FOG_COORD */
+       616, /* GL_FRAGMENT_DEPTH */
        364, /* GL_CURRENT_FOG_COORD */
-       598, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       597, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       596, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       593, /* GL_FOG_COORDINATE_ARRAY */
+       599, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       598, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       597, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       594, /* GL_FOG_COORDINATE_ARRAY */
        241, /* GL_COLOR_SUM */
        385, /* GL_CURRENT_SECONDARY_COLOR */
-      1772, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1774, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1773, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1771, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1768, /* GL_SECONDARY_COLOR_ARRAY */
+      1773, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1775, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1774, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1772, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1769, /* GL_SECONDARY_COLOR_ARRAY */
        383, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1925, /* GL_TEXTURE0 */
-      1927, /* GL_TEXTURE1 */
-      1949, /* GL_TEXTURE2 */
-      1971, /* GL_TEXTURE3 */
-      1977, /* GL_TEXTURE4 */
-      1979, /* GL_TEXTURE5 */
-      1981, /* GL_TEXTURE6 */
-      1983, /* GL_TEXTURE7 */
-      1985, /* GL_TEXTURE8 */
-      1987, /* GL_TEXTURE9 */
-      1928, /* GL_TEXTURE10 */
-      1930, /* GL_TEXTURE11 */
-      1932, /* GL_TEXTURE12 */
-      1934, /* GL_TEXTURE13 */
-      1936, /* GL_TEXTURE14 */
-      1938, /* GL_TEXTURE15 */
-      1940, /* GL_TEXTURE16 */
-      1942, /* GL_TEXTURE17 */
-      1944, /* GL_TEXTURE18 */
-      1946, /* GL_TEXTURE19 */
-      1950, /* GL_TEXTURE20 */
-      1952, /* GL_TEXTURE21 */
-      1954, /* GL_TEXTURE22 */
-      1956, /* GL_TEXTURE23 */
-      1958, /* GL_TEXTURE24 */
-      1960, /* GL_TEXTURE25 */
-      1962, /* GL_TEXTURE26 */
-      1964, /* GL_TEXTURE27 */
-      1966, /* GL_TEXTURE28 */
-      1968, /* GL_TEXTURE29 */
-      1972, /* GL_TEXTURE30 */
-      1974, /* GL_TEXTURE31 */
+      1926, /* GL_TEXTURE0 */
+      1928, /* GL_TEXTURE1 */
+      1950, /* GL_TEXTURE2 */
+      1972, /* GL_TEXTURE3 */
+      1978, /* GL_TEXTURE4 */
+      1980, /* GL_TEXTURE5 */
+      1982, /* GL_TEXTURE6 */
+      1984, /* GL_TEXTURE7 */
+      1986, /* GL_TEXTURE8 */
+      1988, /* GL_TEXTURE9 */
+      1929, /* GL_TEXTURE10 */
+      1931, /* GL_TEXTURE11 */
+      1933, /* GL_TEXTURE12 */
+      1935, /* GL_TEXTURE13 */
+      1937, /* GL_TEXTURE14 */
+      1939, /* GL_TEXTURE15 */
+      1941, /* GL_TEXTURE16 */
+      1943, /* GL_TEXTURE17 */
+      1945, /* GL_TEXTURE18 */
+      1947, /* GL_TEXTURE19 */
+      1951, /* GL_TEXTURE20 */
+      1953, /* GL_TEXTURE21 */
+      1955, /* GL_TEXTURE22 */
+      1957, /* GL_TEXTURE23 */
+      1959, /* GL_TEXTURE24 */
+      1961, /* GL_TEXTURE25 */
+      1963, /* GL_TEXTURE26 */
+      1965, /* GL_TEXTURE27 */
+      1967, /* GL_TEXTURE28 */
+      1969, /* GL_TEXTURE29 */
+      1973, /* GL_TEXTURE30 */
+      1975, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
        166, /* GL_CLIENT_ACTIVE_TEXTURE */
-      1140, /* GL_MAX_TEXTURE_UNITS */
-      2173, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2176, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2178, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2170, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1907, /* GL_SUBTRACT */
-      1121, /* GL_MAX_RENDERBUFFER_SIZE */
+      1141, /* GL_MAX_TEXTURE_UNITS */
+      2174, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2177, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2179, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2171, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1908, /* GL_SUBTRACT */
+      1122, /* 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 */
-      2049, /* GL_TEXTURE_COMPRESSION_HINT */
-      2127, /* GL_TEXTURE_RECTANGLE */
-      2014, /* GL_TEXTURE_BINDING_RECTANGLE */
-      1534, /* GL_PROXY_TEXTURE_RECTANGLE */
-      1118, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+      2050, /* GL_TEXTURE_COMPRESSION_HINT */
+      2128, /* GL_TEXTURE_RECTANGLE */
+      2015, /* GL_TEXTURE_BINDING_RECTANGLE */
+      1535, /* GL_PROXY_TEXTURE_RECTANGLE */
+      1119, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
        431, /* GL_DEPTH_STENCIL */
-      2207, /* GL_UNSIGNED_INT_24_8 */
-      1135, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2116, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-      1137, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2088, /* GL_TEXTURE_FILTER_CONTROL */
-      2106, /* GL_TEXTURE_LOD_BIAS */
+      2208, /* GL_UNSIGNED_INT_24_8 */
+      1136, /* GL_MAX_TEXTURE_LOD_BIAS */
+      2117, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1138, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      2089, /* GL_TEXTURE_FILTER_CONTROL */
+      2107, /* GL_TEXTURE_LOD_BIAS */
        274, /* GL_COMBINE4 */
-      1127, /* GL_MAX_SHININESS_NV */
-      1128, /* GL_MAX_SPOT_EXPONENT_NV */
-       751, /* GL_INCR_WRAP */
+      1128, /* GL_MAX_SHININESS_NV */
+      1129, /* GL_MAX_SPOT_EXPONENT_NV */
+       752, /* GL_INCR_WRAP */
        396, /* GL_DECR_WRAP */
-      1199, /* GL_MODELVIEW1_ARB */
-      1257, /* GL_NORMAL_MAP */
-      1585, /* GL_REFLECTION_MAP */
-      2059, /* GL_TEXTURE_CUBE_MAP */
-      2010, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2071, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2061, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2074, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2064, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2077, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2067, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1532, /* GL_PROXY_TEXTURE_CUBE_MAP */
-      1056, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1235, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-      1472, /* GL_PRIMITIVE_RESTART_NV */
-      1471, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-       607, /* GL_FOG_DISTANCE_MODE_NV */
-       554, /* GL_EYE_RADIAL_NV */
-       553, /* GL_EYE_PLANE_ABSOLUTE_NV */
+      1200, /* GL_MODELVIEW1_ARB */
+      1258, /* GL_NORMAL_MAP */
+      1586, /* GL_REFLECTION_MAP */
+      2060, /* GL_TEXTURE_CUBE_MAP */
+      2011, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2072, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2062, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2075, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2065, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2078, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2068, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1533, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1057, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+      1236, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+      1473, /* GL_PRIMITIVE_RESTART_NV */
+      1472, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+       608, /* GL_FOG_DISTANCE_MODE_NV */
+       555, /* GL_EYE_RADIAL_NV */
+       554, /* GL_EYE_PLANE_ABSOLUTE_NV */
        273, /* GL_COMBINE */
        280, /* GL_COMBINE_RGB */
        275, /* GL_COMBINE_ALPHA */
-      1717, /* GL_RGB_SCALE */
+      1718, /* GL_RGB_SCALE */
         25, /* GL_ADD_SIGNED */
-       788, /* GL_INTERPOLATE */
+       789, /* GL_INTERPOLATE */
        316, /* GL_CONSTANT */
-      1464, /* GL_PRIMARY_COLOR */
-      1461, /* GL_PREVIOUS */
-      1812, /* GL_SOURCE0_RGB */
-      1818, /* GL_SOURCE1_RGB */
-      1824, /* GL_SOURCE2_RGB */
-      1828, /* GL_SOURCE3_RGB_NV */
-      1809, /* GL_SOURCE0_ALPHA */
-      1815, /* GL_SOURCE1_ALPHA */
-      1821, /* GL_SOURCE2_ALPHA */
-      1827, /* GL_SOURCE3_ALPHA_NV */
-      1300, /* GL_OPERAND0_RGB */
-      1306, /* GL_OPERAND1_RGB */
-      1312, /* GL_OPERAND2_RGB */
-      1316, /* GL_OPERAND3_RGB_NV */
-      1297, /* GL_OPERAND0_ALPHA */
-      1303, /* GL_OPERAND1_ALPHA */
-      1309, /* GL_OPERAND2_ALPHA */
-      1315, /* GL_OPERAND3_ALPHA_NV */
+      1465, /* GL_PRIMARY_COLOR */
+      1462, /* GL_PREVIOUS */
+      1813, /* GL_SOURCE0_RGB */
+      1819, /* GL_SOURCE1_RGB */
+      1825, /* GL_SOURCE2_RGB */
+      1829, /* GL_SOURCE3_RGB_NV */
+      1810, /* GL_SOURCE0_ALPHA */
+      1816, /* GL_SOURCE1_ALPHA */
+      1822, /* GL_SOURCE2_ALPHA */
+      1828, /* GL_SOURCE3_ALPHA_NV */
+      1301, /* GL_OPERAND0_RGB */
+      1307, /* GL_OPERAND1_RGB */
+      1313, /* GL_OPERAND2_RGB */
+      1317, /* GL_OPERAND3_RGB_NV */
+      1298, /* GL_OPERAND0_ALPHA */
+      1304, /* GL_OPERAND1_ALPHA */
+      1310, /* GL_OPERAND2_ALPHA */
+      1316, /* GL_OPERAND3_ALPHA_NV */
        137, /* GL_BUFFER_OBJECT_APPLE */
-      2259, /* GL_VERTEX_ARRAY_BINDING */
-      2125, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2126, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2336, /* GL_YCBCR_422_APPLE */
-      2248, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2250, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2137, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1898, /* GL_STORAGE_PRIVATE_APPLE */
-      1897, /* GL_STORAGE_CACHED_APPLE */
-      1899, /* GL_STORAGE_SHARED_APPLE */
-      1799, /* GL_SLICE_ACCUM_SUN */
-      1543, /* GL_QUAD_MESH_SUN */
-      2184, /* GL_TRIANGLE_MESH_SUN */
-      2301, /* GL_VERTEX_PROGRAM_ARB */
-      2312, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2286, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2294, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2296, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2298, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      2260, /* GL_VERTEX_ARRAY_BINDING */
+      2126, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2127, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2337, /* GL_YCBCR_422_APPLE */
+      2249, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2251, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2138, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1899, /* GL_STORAGE_PRIVATE_APPLE */
+      1898, /* GL_STORAGE_CACHED_APPLE */
+      1900, /* GL_STORAGE_SHARED_APPLE */
+      1800, /* GL_SLICE_ACCUM_SUN */
+      1544, /* GL_QUAD_MESH_SUN */
+      2185, /* GL_TRIANGLE_MESH_SUN */
+      2302, /* GL_VERTEX_PROGRAM_ARB */
+      2313, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2287, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2295, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2297, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2299, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        387, /* GL_CURRENT_VERTEX_ATTRIB */
-      1488, /* GL_PROGRAM_LENGTH_ARB */
-      1504, /* GL_PROGRAM_STRING_ARB */
-      1222, /* GL_MODELVIEW_PROJECTION_NV */
-       744, /* GL_IDENTITY_NV */
-       821, /* GL_INVERSE_NV */
-      2175, /* GL_TRANSPOSE_NV */
-       822, /* GL_INVERSE_TRANSPOSE_NV */
-      1102, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-      1101, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       982, /* GL_MATRIX0_NV */
-       994, /* GL_MATRIX1_NV */
-      1006, /* GL_MATRIX2_NV */
-      1010, /* GL_MATRIX3_NV */
-      1012, /* GL_MATRIX4_NV */
-      1014, /* GL_MATRIX5_NV */
-      1016, /* GL_MATRIX6_NV */
-      1018, /* GL_MATRIX7_NV */
+      1489, /* GL_PROGRAM_LENGTH_ARB */
+      1505, /* GL_PROGRAM_STRING_ARB */
+      1223, /* GL_MODELVIEW_PROJECTION_NV */
+       745, /* GL_IDENTITY_NV */
+       822, /* GL_INVERSE_NV */
+      2176, /* GL_TRANSPOSE_NV */
+       823, /* GL_INVERSE_TRANSPOSE_NV */
+      1103, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+      1102, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       983, /* GL_MATRIX0_NV */
+       995, /* GL_MATRIX1_NV */
+      1007, /* GL_MATRIX2_NV */
+      1011, /* GL_MATRIX3_NV */
+      1013, /* GL_MATRIX4_NV */
+      1015, /* GL_MATRIX5_NV */
+      1017, /* GL_MATRIX6_NV */
+      1019, /* GL_MATRIX7_NV */
        370, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        367, /* GL_CURRENT_MATRIX_ARB */
-      1501, /* GL_PROGRAM_POINT_SIZE */
-      2307, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1500, /* GL_PROGRAM_PARAMETER_NV */
-      2292, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1506, /* GL_PROGRAM_TARGET_NV */
-      1503, /* GL_PROGRAM_RESIDENT_NV */
-      2147, /* GL_TRACK_MATRIX_NV */
-      2148, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2302, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1482, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      1502, /* GL_PROGRAM_POINT_SIZE */
+      2308, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1501, /* GL_PROGRAM_PARAMETER_NV */
+      2293, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1507, /* GL_PROGRAM_TARGET_NV */
+      1504, /* GL_PROGRAM_RESIDENT_NV */
+      2148, /* GL_TRACK_MATRIX_NV */
+      2149, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2303, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1483, /* GL_PROGRAM_ERROR_POSITION_ARB */
        412, /* GL_DEPTH_CLAMP */
-      2267, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2274, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2275, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2276, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2277, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2278, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2279, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2280, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2281, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2282, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2268, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2269, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2270, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2271, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2272, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2273, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       930, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       937, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       938, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       939, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       940, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       941, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       942, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       943, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       944, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       945, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       931, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       932, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       933, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       934, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       935, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       936, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       957, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       964, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       965, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       966, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       967, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       968, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       969, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1481, /* GL_PROGRAM_BINDING_ARB */
-       971, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       972, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       958, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       959, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       960, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       961, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       962, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       963, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2047, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2044, /* GL_TEXTURE_COMPRESSED */
-      1264, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      2268, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2275, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2276, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2277, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2278, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2279, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2280, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2281, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2282, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2283, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2269, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2270, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2271, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2272, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2273, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2274, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       931, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       938, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       939, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       940, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       941, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       942, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       943, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       944, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       945, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       946, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       932, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       933, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       934, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       935, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       936, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       937, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       958, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       965, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       966, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       967, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       968, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       969, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       970, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1482, /* GL_PROGRAM_BINDING_ARB */
+       972, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       973, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       959, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       960, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       961, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       962, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       963, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       964, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      2048, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2045, /* GL_TEXTURE_COMPRESSED */
+      1265, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        314, /* GL_COMPRESSED_TEXTURE_FORMATS */
-      1162, /* GL_MAX_VERTEX_UNITS_ARB */
+      1163, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2330, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2300, /* GL_VERTEX_BLEND_ARB */
+      2331, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2301, /* GL_VERTEX_BLEND_ARB */
        389, /* GL_CURRENT_WEIGHT_ARB */
-      2328, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2326, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2324, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2322, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2317, /* GL_WEIGHT_ARRAY_ARB */
+      2329, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2327, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2325, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2323, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2318, /* GL_WEIGHT_ARRAY_ARB */
        446, /* GL_DOT3_RGB */
        447, /* GL_DOT3_RGBA */
        308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1230, /* GL_MULTISAMPLE_3DFX */
-      1757, /* GL_SAMPLE_BUFFERS_3DFX */
-      1748, /* GL_SAMPLES_3DFX */
-      1210, /* GL_MODELVIEW2_ARB */
-      1213, /* GL_MODELVIEW3_ARB */
-      1214, /* GL_MODELVIEW4_ARB */
-      1215, /* GL_MODELVIEW5_ARB */
-      1216, /* GL_MODELVIEW6_ARB */
-      1217, /* GL_MODELVIEW7_ARB */
-      1218, /* GL_MODELVIEW8_ARB */
-      1219, /* GL_MODELVIEW9_ARB */
-      1189, /* GL_MODELVIEW10_ARB */
-      1190, /* GL_MODELVIEW11_ARB */
-      1191, /* GL_MODELVIEW12_ARB */
-      1192, /* GL_MODELVIEW13_ARB */
-      1193, /* GL_MODELVIEW14_ARB */
-      1194, /* GL_MODELVIEW15_ARB */
-      1195, /* GL_MODELVIEW16_ARB */
-      1196, /* GL_MODELVIEW17_ARB */
-      1197, /* GL_MODELVIEW18_ARB */
-      1198, /* GL_MODELVIEW19_ARB */
-      1200, /* GL_MODELVIEW20_ARB */
-      1201, /* GL_MODELVIEW21_ARB */
-      1202, /* GL_MODELVIEW22_ARB */
-      1203, /* GL_MODELVIEW23_ARB */
-      1204, /* GL_MODELVIEW24_ARB */
-      1205, /* GL_MODELVIEW25_ARB */
-      1206, /* GL_MODELVIEW26_ARB */
-      1207, /* GL_MODELVIEW27_ARB */
-      1208, /* GL_MODELVIEW28_ARB */
-      1209, /* GL_MODELVIEW29_ARB */
-      1211, /* GL_MODELVIEW30_ARB */
-      1212, /* GL_MODELVIEW31_ARB */
+      1231, /* GL_MULTISAMPLE_3DFX */
+      1758, /* GL_SAMPLE_BUFFERS_3DFX */
+      1749, /* GL_SAMPLES_3DFX */
+      1211, /* GL_MODELVIEW2_ARB */
+      1214, /* GL_MODELVIEW3_ARB */
+      1215, /* GL_MODELVIEW4_ARB */
+      1216, /* GL_MODELVIEW5_ARB */
+      1217, /* GL_MODELVIEW6_ARB */
+      1218, /* GL_MODELVIEW7_ARB */
+      1219, /* GL_MODELVIEW8_ARB */
+      1220, /* GL_MODELVIEW9_ARB */
+      1190, /* GL_MODELVIEW10_ARB */
+      1191, /* GL_MODELVIEW11_ARB */
+      1192, /* GL_MODELVIEW12_ARB */
+      1193, /* GL_MODELVIEW13_ARB */
+      1194, /* GL_MODELVIEW14_ARB */
+      1195, /* GL_MODELVIEW15_ARB */
+      1196, /* GL_MODELVIEW16_ARB */
+      1197, /* GL_MODELVIEW17_ARB */
+      1198, /* GL_MODELVIEW18_ARB */
+      1199, /* GL_MODELVIEW19_ARB */
+      1201, /* GL_MODELVIEW20_ARB */
+      1202, /* GL_MODELVIEW21_ARB */
+      1203, /* GL_MODELVIEW22_ARB */
+      1204, /* GL_MODELVIEW23_ARB */
+      1205, /* GL_MODELVIEW24_ARB */
+      1206, /* GL_MODELVIEW25_ARB */
+      1207, /* GL_MODELVIEW26_ARB */
+      1208, /* GL_MODELVIEW27_ARB */
+      1209, /* GL_MODELVIEW28_ARB */
+      1210, /* GL_MODELVIEW29_ARB */
+      1212, /* GL_MODELVIEW30_ARB */
+      1213, /* GL_MODELVIEW31_ARB */
        451, /* GL_DOT3_RGB_EXT */
-      1478, /* GL_PROGRAM_BINARY_LENGTH */
-      1183, /* GL_MIRROR_CLAMP_EXT */
-      1186, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1225, /* GL_MODULATE_ADD_ATI */
-      1226, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1227, /* GL_MODULATE_SUBTRACT_ATI */
-      2337, /* GL_YCBCR_MESA */
-      1324, /* GL_PACK_INVERT_MESA */
+      1479, /* GL_PROGRAM_BINARY_LENGTH */
+      1184, /* GL_MIRROR_CLAMP_EXT */
+      1187, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1226, /* GL_MODULATE_ADD_ATI */
+      1227, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1228, /* GL_MODULATE_SUBTRACT_ATI */
+      2338, /* GL_YCBCR_MESA */
+      1325, /* GL_PACK_INVERT_MESA */
        392, /* GL_DEBUG_OBJECT_MESA */
        393, /* GL_DEBUG_PRINT_MESA */
        391, /* GL_DEBUG_ASSERT_MESA */
@@ -5751,31 +5753,31 @@ static const unsigned reduced_enums[1570] =
        526, /* GL_DU8DV8_ATI */
        143, /* GL_BUMP_ENVMAP_ATI */
        147, /* GL_BUMP_TARGET_ATI */
-      1267, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-      1476, /* GL_PROGRAM_BINARY_FORMATS */
-      1861, /* GL_STENCIL_BACK_FUNC */
-      1859, /* GL_STENCIL_BACK_FAIL */
-      1863, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1865, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       616, /* GL_FRAGMENT_PROGRAM_ARB */
-      1474, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1509, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1508, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1491, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1497, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1496, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1091, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1116, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1115, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1104, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1110, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1109, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1688, /* GL_RGBA32F */
-      1651, /* GL_RGB32F */
-      1679, /* GL_RGBA16F */
-      1643, /* GL_RGB16F */
-      1707, /* GL_RGBA_FLOAT_MODE_ARB */
-      1059, /* GL_MAX_DRAW_BUFFERS */
+      1268, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+      1477, /* GL_PROGRAM_BINARY_FORMATS */
+      1862, /* GL_STENCIL_BACK_FUNC */
+      1860, /* GL_STENCIL_BACK_FAIL */
+      1864, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1866, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       617, /* GL_FRAGMENT_PROGRAM_ARB */
+      1475, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1510, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1509, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1492, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1498, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1497, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1092, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1117, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1116, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1105, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1111, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1110, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1689, /* GL_RGBA32F */
+      1652, /* GL_RGB32F */
+      1680, /* GL_RGBA16F */
+      1644, /* GL_RGB16F */
+      1708, /* GL_RGBA_FLOAT_MODE_ARB */
+      1060, /* GL_MAX_DRAW_BUFFERS */
        455, /* GL_DRAW_BUFFER0 */
        459, /* GL_DRAW_BUFFER1 */
        487, /* GL_DRAW_BUFFER2 */
@@ -5793,308 +5795,308 @@ static const unsigned reduced_enums[1570] =
        476, /* GL_DRAW_BUFFER14 */
        480, /* GL_DRAW_BUFFER15 */
         97, /* GL_BLEND_EQUATION_ALPHA */
-      1033, /* GL_MATRIX_PALETTE_ARB */
-      1084, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-      1087, /* GL_MAX_PALETTE_MATRICES_ARB */
+      1034, /* GL_MATRIX_PALETTE_ARB */
+      1085, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+      1088, /* GL_MAX_PALETTE_MATRICES_ARB */
        373, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-      1021, /* GL_MATRIX_INDEX_ARRAY_ARB */
+      1022, /* GL_MATRIX_INDEX_ARRAY_ARB */
        368, /* GL_CURRENT_MATRIX_INDEX_ARB */
-      1026, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-      1030, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-      1028, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-      1024, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2082, /* GL_TEXTURE_DEPTH_SIZE */
+      1027, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+      1031, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+      1029, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+      1025, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      2083, /* GL_TEXTURE_DEPTH_SIZE */
        439, /* GL_DEPTH_TEXTURE_MODE */
-      2039, /* GL_TEXTURE_COMPARE_MODE */
-      2037, /* GL_TEXTURE_COMPARE_FUNC */
+      2040, /* GL_TEXTURE_COMPARE_MODE */
+      2038, /* GL_TEXTURE_COMPARE_FUNC */
        284, /* GL_COMPARE_REF_TO_TEXTURE */
-      1401, /* GL_POINT_SPRITE */
+      1402, /* GL_POINT_SPRITE */
        347, /* GL_COORD_REPLACE */
-      1406, /* GL_POINT_SPRITE_R_MODE_NV */
-      1549, /* GL_QUERY_COUNTER_BITS */
+      1407, /* GL_POINT_SPRITE_R_MODE_NV */
+      1550, /* GL_QUERY_COUNTER_BITS */
        376, /* GL_CURRENT_QUERY */
-      1553, /* GL_QUERY_RESULT */
-      1555, /* GL_QUERY_RESULT_AVAILABLE */
-      1154, /* GL_MAX_VERTEX_ATTRIBS */
-      2290, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1554, /* GL_QUERY_RESULT */
+      1556, /* GL_QUERY_RESULT_AVAILABLE */
+      1155, /* GL_MAX_VERTEX_ATTRIBS */
+      2291, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        437, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        436, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-      1131, /* GL_MAX_TEXTURE_COORDS */
-      1133, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1484, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1486, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1485, /* GL_PROGRAM_FORMAT_ARB */
-      2139, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1132, /* GL_MAX_TEXTURE_COORDS */
+      1134, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1485, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1487, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1486, /* GL_PROGRAM_FORMAT_ARB */
+      2140, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        409, /* GL_DEPTH_BOUNDS_TEST_EXT */
        408, /* GL_DEPTH_BOUNDS_EXT */
         61, /* GL_ARRAY_BUFFER */
        540, /* GL_ELEMENT_ARRAY_BUFFER */
         62, /* GL_ARRAY_BUFFER_BINDING */
        541, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2261, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1252, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+      2262, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1253, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       755, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2052, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       756, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      2053, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        536, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1769, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       594, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2318, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2283, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1487, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-      1097, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1493, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1106, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1507, /* GL_PROGRAM_TEMPORARIES_ARB */
-      1112, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1495, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1108, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1499, /* GL_PROGRAM_PARAMETERS_ARB */
-      1111, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1494, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1107, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1475, /* GL_PROGRAM_ATTRIBS_ARB */
-      1092, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1492, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1105, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1473, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1090, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1490, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-      1103, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-      1098, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-      1094, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1510, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2172, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1572, /* GL_READ_ONLY */
-      2332, /* GL_WRITE_ONLY */
-      1574, /* GL_READ_WRITE */
+      1770, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       595, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      2319, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2284, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1488, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      1098, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1494, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1107, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1508, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1113, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1496, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1109, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1500, /* GL_PROGRAM_PARAMETERS_ARB */
+      1112, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1495, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1108, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1476, /* GL_PROGRAM_ATTRIBS_ARB */
+      1093, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1493, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1106, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1474, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1091, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1491, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1104, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1099, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+      1095, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1511, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      2173, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1573, /* GL_READ_ONLY */
+      2333, /* GL_WRITE_ONLY */
+      1575, /* GL_READ_WRITE */
        124, /* GL_BUFFER_ACCESS */
        129, /* GL_BUFFER_MAPPED */
        134, /* GL_BUFFER_MAP_POINTER */
-      2146, /* GL_TIME_ELAPSED_EXT */
-       981, /* GL_MATRIX0_ARB */
-       993, /* GL_MATRIX1_ARB */
-      1005, /* GL_MATRIX2_ARB */
-      1009, /* GL_MATRIX3_ARB */
-      1011, /* GL_MATRIX4_ARB */
-      1013, /* GL_MATRIX5_ARB */
-      1015, /* GL_MATRIX6_ARB */
-      1017, /* GL_MATRIX7_ARB */
-      1019, /* GL_MATRIX8_ARB */
-      1020, /* GL_MATRIX9_ARB */
-       983, /* GL_MATRIX10_ARB */
-       984, /* GL_MATRIX11_ARB */
-       985, /* GL_MATRIX12_ARB */
-       986, /* GL_MATRIX13_ARB */
-       987, /* GL_MATRIX14_ARB */
-       988, /* GL_MATRIX15_ARB */
-       989, /* GL_MATRIX16_ARB */
-       990, /* GL_MATRIX17_ARB */
-       991, /* GL_MATRIX18_ARB */
-       992, /* GL_MATRIX19_ARB */
-       995, /* GL_MATRIX20_ARB */
-       996, /* GL_MATRIX21_ARB */
-       997, /* GL_MATRIX22_ARB */
-       998, /* GL_MATRIX23_ARB */
-       999, /* GL_MATRIX24_ARB */
-      1000, /* GL_MATRIX25_ARB */
-      1001, /* GL_MATRIX26_ARB */
-      1002, /* GL_MATRIX27_ARB */
-      1003, /* GL_MATRIX28_ARB */
-      1004, /* GL_MATRIX29_ARB */
-      1007, /* GL_MATRIX30_ARB */
-      1008, /* GL_MATRIX31_ARB */
-      1902, /* GL_STREAM_DRAW */
-      1904, /* GL_STREAM_READ */
-      1900, /* GL_STREAM_COPY */
-      1851, /* GL_STATIC_DRAW */
-      1853, /* GL_STATIC_READ */
-      1849, /* GL_STATIC_COPY */
+      2147, /* GL_TIME_ELAPSED_EXT */
+       982, /* GL_MATRIX0_ARB */
+       994, /* GL_MATRIX1_ARB */
+      1006, /* GL_MATRIX2_ARB */
+      1010, /* GL_MATRIX3_ARB */
+      1012, /* GL_MATRIX4_ARB */
+      1014, /* GL_MATRIX5_ARB */
+      1016, /* GL_MATRIX6_ARB */
+      1018, /* GL_MATRIX7_ARB */
+      1020, /* GL_MATRIX8_ARB */
+      1021, /* GL_MATRIX9_ARB */
+       984, /* GL_MATRIX10_ARB */
+       985, /* GL_MATRIX11_ARB */
+       986, /* GL_MATRIX12_ARB */
+       987, /* GL_MATRIX13_ARB */
+       988, /* GL_MATRIX14_ARB */
+       989, /* GL_MATRIX15_ARB */
+       990, /* GL_MATRIX16_ARB */
+       991, /* GL_MATRIX17_ARB */
+       992, /* GL_MATRIX18_ARB */
+       993, /* GL_MATRIX19_ARB */
+       996, /* GL_MATRIX20_ARB */
+       997, /* GL_MATRIX21_ARB */
+       998, /* GL_MATRIX22_ARB */
+       999, /* GL_MATRIX23_ARB */
+      1000, /* GL_MATRIX24_ARB */
+      1001, /* GL_MATRIX25_ARB */
+      1002, /* GL_MATRIX26_ARB */
+      1003, /* GL_MATRIX27_ARB */
+      1004, /* GL_MATRIX28_ARB */
+      1005, /* GL_MATRIX29_ARB */
+      1008, /* GL_MATRIX30_ARB */
+      1009, /* GL_MATRIX31_ARB */
+      1903, /* GL_STREAM_DRAW */
+      1905, /* GL_STREAM_READ */
+      1901, /* GL_STREAM_COPY */
+      1852, /* GL_STATIC_DRAW */
+      1854, /* GL_STATIC_READ */
+      1850, /* GL_STATIC_COPY */
        530, /* GL_DYNAMIC_DRAW */
        532, /* GL_DYNAMIC_READ */
        528, /* GL_DYNAMIC_COPY */
-      1364, /* GL_PIXEL_PACK_BUFFER */
-      1368, /* GL_PIXEL_UNPACK_BUFFER */
-      1365, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1369, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1365, /* GL_PIXEL_PACK_BUFFER */
+      1369, /* GL_PIXEL_UNPACK_BUFFER */
+      1366, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1370, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        400, /* GL_DEPTH24_STENCIL8 */
-      2135, /* GL_TEXTURE_STENCIL_SIZE */
-      2080, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-      1093, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-      1096, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-      1100, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-      1099, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2288, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2285, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-      1038, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-      1177, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-      1113, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1893, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      2136, /* GL_TEXTURE_STENCIL_SIZE */
+      2081, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      1094, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+      1097, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+      1101, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+      1100, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+      2289, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2286, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      1039, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
+      1178, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+      1114, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
+      1894, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
-      1184, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1750, /* GL_SAMPLES_PASSED */
-       709, /* GL_GEOMETRY_VERTICES_OUT */
-       703, /* GL_GEOMETRY_INPUT_TYPE */
-       705, /* GL_GEOMETRY_OUTPUT_TYPE */
-      1740, /* GL_SAMPLER_BINDING */
+      1185, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1751, /* GL_SAMPLES_PASSED */
+       710, /* GL_GEOMETRY_VERTICES_OUT */
+       704, /* GL_GEOMETRY_INPUT_TYPE */
+       706, /* GL_GEOMETRY_OUTPUT_TYPE */
+      1741, /* GL_SAMPLER_BINDING */
        164, /* GL_CLAMP_VERTEX_COLOR_ARB */
        156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
        157, /* GL_CLAMP_READ_COLOR */
-       566, /* GL_FIXED_ONLY */
-      1388, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1387, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1386, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-      1221, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1513, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2115, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+       567, /* GL_FIXED_ONLY */
+      1389, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1388, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1387, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1222, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1514, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2116, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1589, /* GL_RELEASED_APPLE */
-      2315, /* GL_VOLATILE_APPLE */
-      1630, /* GL_RETAINED_APPLE */
-      2189, /* GL_UNDEFINED_APPLE */
-      1537, /* GL_PURGEABLE_APPLE */
-       617, /* GL_FRAGMENT_SHADER */
-      2310, /* GL_VERTEX_SHADER */
-      1498, /* GL_PROGRAM_OBJECT_ARB */
-      1786, /* GL_SHADER_OBJECT_ARB */
-      1068, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-      1159, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-      1150, /* GL_MAX_VARYING_COMPONENTS */
-      1157, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-      1050, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1284, /* GL_OBJECT_TYPE_ARB */
-      1788, /* GL_SHADER_TYPE */
-       582, /* GL_FLOAT_VEC2 */
-       584, /* GL_FLOAT_VEC3 */
-       586, /* GL_FLOAT_VEC4 */
-       809, /* GL_INT_VEC2 */
-       811, /* GL_INT_VEC3 */
-       813, /* GL_INT_VEC4 */
+      1590, /* GL_RELEASED_APPLE */
+      2316, /* GL_VOLATILE_APPLE */
+      1631, /* GL_RETAINED_APPLE */
+      2190, /* GL_UNDEFINED_APPLE */
+      1538, /* GL_PURGEABLE_APPLE */
+       618, /* GL_FRAGMENT_SHADER */
+      2311, /* GL_VERTEX_SHADER */
+      1499, /* GL_PROGRAM_OBJECT_ARB */
+      1787, /* GL_SHADER_OBJECT_ARB */
+      1069, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+      1160, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+      1151, /* GL_MAX_VARYING_COMPONENTS */
+      1158, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+      1051, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1285, /* GL_OBJECT_TYPE_ARB */
+      1789, /* GL_SHADER_TYPE */
+       583, /* GL_FLOAT_VEC2 */
+       585, /* GL_FLOAT_VEC3 */
+       587, /* GL_FLOAT_VEC4 */
+       810, /* GL_INT_VEC2 */
+       812, /* GL_INT_VEC3 */
+       814, /* GL_INT_VEC4 */
        116, /* GL_BOOL */
        118, /* GL_BOOL_VEC2 */
        120, /* GL_BOOL_VEC3 */
        122, /* GL_BOOL_VEC4 */
-       570, /* GL_FLOAT_MAT2 */
-       574, /* GL_FLOAT_MAT3 */
-       578, /* GL_FLOAT_MAT4 */
-      1724, /* GL_SAMPLER_1D */
-      1730, /* GL_SAMPLER_2D */
-      1738, /* GL_SAMPLER_3D */
-      1743, /* GL_SAMPLER_CUBE */
-      1729, /* GL_SAMPLER_1D_SHADOW */
-      1737, /* GL_SAMPLER_2D_SHADOW */
-      1735, /* GL_SAMPLER_2D_RECT */
-      1736, /* GL_SAMPLER_2D_RECT_SHADOW */
-       572, /* GL_FLOAT_MAT2x3 */
-       573, /* GL_FLOAT_MAT2x4 */
-       576, /* GL_FLOAT_MAT3x2 */
-       577, /* GL_FLOAT_MAT3x4 */
-       580, /* GL_FLOAT_MAT4x2 */
-       581, /* GL_FLOAT_MAT4x3 */
+       571, /* GL_FLOAT_MAT2 */
+       575, /* GL_FLOAT_MAT3 */
+       579, /* GL_FLOAT_MAT4 */
+      1725, /* GL_SAMPLER_1D */
+      1731, /* GL_SAMPLER_2D */
+      1739, /* GL_SAMPLER_3D */
+      1744, /* GL_SAMPLER_CUBE */
+      1730, /* GL_SAMPLER_1D_SHADOW */
+      1738, /* GL_SAMPLER_2D_SHADOW */
+      1736, /* GL_SAMPLER_2D_RECT */
+      1737, /* GL_SAMPLER_2D_RECT_SHADOW */
+       573, /* GL_FLOAT_MAT2x3 */
+       574, /* GL_FLOAT_MAT2x4 */
+       577, /* GL_FLOAT_MAT3x2 */
+       578, /* GL_FLOAT_MAT3x4 */
+       581, /* GL_FLOAT_MAT4x2 */
+       582, /* GL_FLOAT_MAT4x3 */
        398, /* GL_DELETE_STATUS */
        289, /* GL_COMPILE_STATUS */
-       870, /* GL_LINK_STATUS */
-      2255, /* GL_VALIDATE_STATUS */
-       767, /* GL_INFO_LOG_LENGTH */
+       871, /* GL_LINK_STATUS */
+      2256, /* GL_VALIDATE_STATUS */
+       768, /* GL_INFO_LOG_LENGTH */
         64, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1787, /* GL_SHADER_SOURCE_LENGTH */
+      1788, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       619, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1790, /* GL_SHADING_LANGUAGE_VERSION */
+       620, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1791, /* GL_SHADING_LANGUAGE_VERSION */
        375, /* GL_CURRENT_PROGRAM */
-      1333, /* GL_PALETTE4_RGB8_OES */
-      1335, /* GL_PALETTE4_RGBA8_OES */
-      1331, /* GL_PALETTE4_R5_G6_B5_OES */
-      1334, /* GL_PALETTE4_RGBA4_OES */
-      1332, /* GL_PALETTE4_RGB5_A1_OES */
-      1338, /* GL_PALETTE8_RGB8_OES */
-      1340, /* GL_PALETTE8_RGBA8_OES */
-      1336, /* GL_PALETTE8_R5_G6_B5_OES */
-      1339, /* GL_PALETTE8_RGBA4_OES */
-      1337, /* GL_PALETTE8_RGB5_A1_OES */
-       748, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-       746, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-      1385, /* GL_POINT_SIZE_ARRAY_OES */
-      2058, /* GL_TEXTURE_CROP_RECT_OES */
-      1022, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1384, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2238, /* GL_UNSIGNED_NORMALIZED */
-      1990, /* GL_TEXTURE_1D_ARRAY */
-      1523, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      1993, /* GL_TEXTURE_2D_ARRAY */
-      1527, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      2001, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      2004, /* GL_TEXTURE_BINDING_2D_ARRAY */
-      1075, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      2022, /* GL_TEXTURE_BUFFER */
-      1129, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      2008, /* GL_TEXTURE_BINDING_BUFFER */
-      2024, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      2026, /* GL_TEXTURE_BUFFER_FORMAT */
-      1560, /* GL_R11F_G11F_B10F */
-      2204, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-      1674, /* GL_RGB9_E5 */
-      2213, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2133, /* GL_TEXTURE_SHARED_SIZE */
-      1843, /* GL_SRGB */
-      1844, /* GL_SRGB8 */
-      1846, /* GL_SRGB_ALPHA */
-      1845, /* GL_SRGB8_ALPHA8 */
-      1803, /* GL_SLUMINANCE_ALPHA */
-      1802, /* GL_SLUMINANCE8_ALPHA8 */
-      1800, /* GL_SLUMINANCE */
-      1801, /* GL_SLUMINANCE8 */
+      1334, /* GL_PALETTE4_RGB8_OES */
+      1336, /* GL_PALETTE4_RGBA8_OES */
+      1332, /* GL_PALETTE4_R5_G6_B5_OES */
+      1335, /* GL_PALETTE4_RGBA4_OES */
+      1333, /* GL_PALETTE4_RGB5_A1_OES */
+      1339, /* GL_PALETTE8_RGB8_OES */
+      1341, /* GL_PALETTE8_RGBA8_OES */
+      1337, /* GL_PALETTE8_R5_G6_B5_OES */
+      1340, /* GL_PALETTE8_RGBA4_OES */
+      1338, /* GL_PALETTE8_RGB5_A1_OES */
+       749, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+       747, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+      1386, /* GL_POINT_SIZE_ARRAY_OES */
+      2059, /* GL_TEXTURE_CROP_RECT_OES */
+      1023, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+      1385, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      2239, /* GL_UNSIGNED_NORMALIZED */
+      1991, /* GL_TEXTURE_1D_ARRAY */
+      1524, /* GL_PROXY_TEXTURE_1D_ARRAY */
+      1994, /* GL_TEXTURE_2D_ARRAY */
+      1528, /* GL_PROXY_TEXTURE_2D_ARRAY */
+      2002, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      2005, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1076, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
+      2023, /* GL_TEXTURE_BUFFER */
+      1130, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+      2009, /* GL_TEXTURE_BINDING_BUFFER */
+      2025, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      2027, /* GL_TEXTURE_BUFFER_FORMAT */
+      1561, /* GL_R11F_G11F_B10F */
+      2205, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      1675, /* GL_RGB9_E5 */
+      2214, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2134, /* GL_TEXTURE_SHARED_SIZE */
+      1844, /* GL_SRGB */
+      1845, /* GL_SRGB8 */
+      1847, /* GL_SRGB_ALPHA */
+      1846, /* GL_SRGB8_ALPHA8 */
+      1804, /* GL_SLUMINANCE_ALPHA */
+      1803, /* GL_SLUMINANCE8_ALPHA8 */
+      1801, /* GL_SLUMINANCE */
+      1802, /* GL_SLUMINANCE8 */
        312, /* GL_COMPRESSED_SRGB */
        313, /* GL_COMPRESSED_SRGB_ALPHA */
        310, /* GL_COMPRESSED_SLUMINANCE */
        311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2168, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2157, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-      1148, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2166, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2162, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2160, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-      1467, /* GL_PRIMITIVES_GENERATED */
-      2164, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-      1564, /* GL_RASTERIZER_DISCARD */
-      1144, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-      1146, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-       786, /* GL_INTERLEAVED_ATTRIBS */
-      1779, /* GL_SEPARATE_ATTRIBS */
-      2152, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2154, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-      1403, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       879, /* GL_LOWER_LEFT */
-      2252, /* GL_UPPER_LEFT */
-      1867, /* GL_STENCIL_BACK_REF */
-      1868, /* GL_STENCIL_BACK_VALUE_MASK */
-      1869, /* GL_STENCIL_BACK_WRITEMASK */
+      2169, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2158, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      1149, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+      2167, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2163, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2161, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      1468, /* GL_PRIMITIVES_GENERATED */
+      2165, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      1565, /* GL_RASTERIZER_DISCARD */
+      1145, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+      1147, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+       787, /* GL_INTERLEAVED_ATTRIBS */
+      1780, /* GL_SEPARATE_ATTRIBS */
+      2153, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2155, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1404, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       880, /* GL_LOWER_LEFT */
+      2253, /* GL_UPPER_LEFT */
+      1868, /* GL_STENCIL_BACK_REF */
+      1869, /* GL_STENCIL_BACK_VALUE_MASK */
+      1870, /* GL_STENCIL_BACK_WRITEMASK */
        520, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1594, /* GL_RENDERBUFFER_BINDING */
-      1568, /* GL_READ_FRAMEBUFFER */
+      1595, /* GL_RENDERBUFFER_BINDING */
+      1569, /* GL_READ_FRAMEBUFFER */
        519, /* GL_DRAW_FRAMEBUFFER */
-      1569, /* GL_READ_FRAMEBUFFER_BINDING */
-      1613, /* GL_RENDERBUFFER_SAMPLES */
-       633, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       630, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       645, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       640, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       643, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       651, /* GL_FRAMEBUFFER_COMPLETE */
-       656, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       671, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       665, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       660, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       666, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       662, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-       676, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-       682, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       680, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-      1046, /* GL_MAX_COLOR_ATTACHMENTS */
+      1570, /* GL_READ_FRAMEBUFFER_BINDING */
+      1614, /* GL_RENDERBUFFER_SAMPLES */
+       634, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       631, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       646, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       641, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       644, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       652, /* GL_FRAMEBUFFER_COMPLETE */
+       657, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       672, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       666, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       661, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       667, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       663, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+       677, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+       683, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       681, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+      1047, /* GL_MAX_COLOR_ATTACHMENTS */
        196, /* GL_COLOR_ATTACHMENT0 */
        199, /* GL_COLOR_ATTACHMENT1 */
        213, /* GL_COLOR_ATTACHMENT2 */
@@ -6112,190 +6114,191 @@ static const unsigned reduced_enums[1570] =
        208, /* GL_COLOR_ATTACHMENT14 */
        210, /* GL_COLOR_ATTACHMENT15 */
        403, /* GL_DEPTH_ATTACHMENT */
-      1856, /* GL_STENCIL_ATTACHMENT */
-       621, /* GL_FRAMEBUFFER */
-      1591, /* GL_RENDERBUFFER */
-      1617, /* GL_RENDERBUFFER_WIDTH */
-      1604, /* GL_RENDERBUFFER_HEIGHT */
-      1607, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1888, /* GL_STENCIL_INDEX_EXT */
-      1877, /* GL_STENCIL_INDEX1 */
-      1882, /* GL_STENCIL_INDEX4 */
-      1885, /* GL_STENCIL_INDEX8 */
-      1878, /* GL_STENCIL_INDEX16 */
-      1611, /* GL_RENDERBUFFER_RED_SIZE */
-      1602, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1597, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1592, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1599, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1615, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       674, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-      1124, /* GL_MAX_SAMPLES */
-      2095, /* GL_TEXTURE_GEN_STR_OES */
-       722, /* GL_HALF_FLOAT_OES */
-      1660, /* GL_RGB565 */
-      2087, /* GL_TEXTURE_EXTERNAL_OES */
-      1746, /* GL_SAMPLER_EXTERNAL_OES */
-      2013, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-      1626, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-      1691, /* GL_RGBA32UI */
-      1654, /* GL_RGB32UI */
+      1857, /* GL_STENCIL_ATTACHMENT */
+       622, /* GL_FRAMEBUFFER */
+      1592, /* GL_RENDERBUFFER */
+      1618, /* GL_RENDERBUFFER_WIDTH */
+      1605, /* GL_RENDERBUFFER_HEIGHT */
+      1608, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1889, /* GL_STENCIL_INDEX_EXT */
+      1878, /* GL_STENCIL_INDEX1 */
+      1883, /* GL_STENCIL_INDEX4 */
+      1886, /* GL_STENCIL_INDEX8 */
+      1879, /* GL_STENCIL_INDEX16 */
+      1612, /* GL_RENDERBUFFER_RED_SIZE */
+      1603, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1598, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1593, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1600, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1616, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       675, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+      1125, /* GL_MAX_SAMPLES */
+      2096, /* GL_TEXTURE_GEN_STR_OES */
+       723, /* GL_HALF_FLOAT_OES */
+      1661, /* GL_RGB565 */
+       547, /* GL_ETC1_RGB8_OES */
+      2088, /* GL_TEXTURE_EXTERNAL_OES */
+      1747, /* GL_SAMPLER_EXTERNAL_OES */
+      2014, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+      1627, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+      1692, /* GL_RGBA32UI */
+      1655, /* GL_RGB32UI */
         40, /* GL_ALPHA32UI_EXT */
-       778, /* GL_INTENSITY32UI_EXT */
-       896, /* GL_LUMINANCE32UI_EXT */
-       913, /* GL_LUMINANCE_ALPHA32UI_EXT */
-      1682, /* GL_RGBA16UI */
-      1646, /* GL_RGB16UI */
+       779, /* GL_INTENSITY32UI_EXT */
+       897, /* GL_LUMINANCE32UI_EXT */
+       914, /* GL_LUMINANCE_ALPHA32UI_EXT */
+      1683, /* GL_RGBA16UI */
+      1647, /* GL_RGB16UI */
         37, /* GL_ALPHA16UI_EXT */
-       775, /* GL_INTENSITY16UI_EXT */
-       891, /* GL_LUMINANCE16UI_EXT */
-       911, /* GL_LUMINANCE_ALPHA16UI_EXT */
-      1701, /* GL_RGBA8UI */
-      1669, /* GL_RGB8UI */
+       776, /* GL_INTENSITY16UI_EXT */
+       892, /* GL_LUMINANCE16UI_EXT */
+       912, /* GL_LUMINANCE_ALPHA16UI_EXT */
+      1702, /* GL_RGBA8UI */
+      1670, /* GL_RGB8UI */
         45, /* GL_ALPHA8UI_EXT */
-       783, /* GL_INTENSITY8UI_EXT */
-       905, /* GL_LUMINANCE8UI_EXT */
-       915, /* GL_LUMINANCE_ALPHA8UI_EXT */
-      1689, /* GL_RGBA32I */
-      1652, /* GL_RGB32I */
+       784, /* GL_INTENSITY8UI_EXT */
+       906, /* GL_LUMINANCE8UI_EXT */
+       916, /* GL_LUMINANCE_ALPHA8UI_EXT */
+      1690, /* GL_RGBA32I */
+      1653, /* GL_RGB32I */
         39, /* GL_ALPHA32I_EXT */
-       777, /* GL_INTENSITY32I_EXT */
-       895, /* GL_LUMINANCE32I_EXT */
-       912, /* GL_LUMINANCE_ALPHA32I_EXT */
-      1680, /* GL_RGBA16I */
-      1644, /* GL_RGB16I */
+       778, /* GL_INTENSITY32I_EXT */
+       896, /* GL_LUMINANCE32I_EXT */
+       913, /* GL_LUMINANCE_ALPHA32I_EXT */
+      1681, /* GL_RGBA16I */
+      1645, /* GL_RGB16I */
         36, /* GL_ALPHA16I_EXT */
-       774, /* GL_INTENSITY16I_EXT */
-       890, /* GL_LUMINANCE16I_EXT */
-       910, /* GL_LUMINANCE_ALPHA16I_EXT */
-      1699, /* GL_RGBA8I */
-      1667, /* GL_RGB8I */
+       775, /* GL_INTENSITY16I_EXT */
+       891, /* GL_LUMINANCE16I_EXT */
+       911, /* GL_LUMINANCE_ALPHA16I_EXT */
+      1700, /* GL_RGBA8I */
+      1668, /* GL_RGB8I */
         44, /* GL_ALPHA8I_EXT */
-       782, /* GL_INTENSITY8I_EXT */
-       904, /* GL_LUMINANCE8I_EXT */
-       914, /* GL_LUMINANCE_ALPHA8I_EXT */
-      1581, /* GL_RED_INTEGER */
-       717, /* GL_GREEN_INTEGER */
+       783, /* GL_INTENSITY8I_EXT */
+       905, /* GL_LUMINANCE8I_EXT */
+       915, /* GL_LUMINANCE_ALPHA8I_EXT */
+      1582, /* GL_RED_INTEGER */
+       718, /* GL_GREEN_INTEGER */
        113, /* GL_BLUE_INTEGER */
         49, /* GL_ALPHA_INTEGER_EXT */
-      1714, /* GL_RGB_INTEGER */
-      1708, /* GL_RGBA_INTEGER */
+      1715, /* GL_RGB_INTEGER */
+      1709, /* GL_RGBA_INTEGER */
         84, /* GL_BGR_INTEGER */
         82, /* GL_BGRA_INTEGER */
-       917, /* GL_LUMINANCE_INTEGER_EXT */
-       916, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-      1710, /* GL_RGBA_INTEGER_MODE_EXT */
-       792, /* GL_INT_2_10_10_10_REV */
-       628, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
-       669, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
-       668, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-      1725, /* GL_SAMPLER_1D_ARRAY */
-      1731, /* GL_SAMPLER_2D_ARRAY */
-      1741, /* GL_SAMPLER_BUFFER */
-      1727, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-      1733, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1744, /* GL_SAMPLER_CUBE_SHADOW */
-      2232, /* GL_UNSIGNED_INT_VEC2 */
-      2234, /* GL_UNSIGNED_INT_VEC3 */
-      2236, /* GL_UNSIGNED_INT_VEC4 */
-       793, /* GL_INT_SAMPLER_1D */
-       797, /* GL_INT_SAMPLER_2D */
-       803, /* GL_INT_SAMPLER_3D */
-       807, /* GL_INT_SAMPLER_CUBE */
-       801, /* GL_INT_SAMPLER_2D_RECT */
-       794, /* GL_INT_SAMPLER_1D_ARRAY */
-       798, /* GL_INT_SAMPLER_2D_ARRAY */
-       805, /* GL_INT_SAMPLER_BUFFER */
-      2216, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2220, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2226, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2230, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2224, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2217, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2221, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2228, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-       707, /* GL_GEOMETRY_SHADER */
-       710, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-       704, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-       706, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-      1081, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-      1164, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-      1079, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
-      1073, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
-      1077, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
-       880, /* GL_LOW_FLOAT */
-      1166, /* GL_MEDIUM_FLOAT */
-       723, /* GL_HIGH_FLOAT */
-       881, /* GL_LOW_INT */
-      1167, /* GL_MEDIUM_INT */
-       724, /* GL_HIGH_INT */
-      2206, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-       791, /* GL_INT_10_10_10_2_OES */
-      1784, /* GL_SHADER_BINARY_FORMATS */
-      1269, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1785, /* GL_SHADER_COMPILER */
-      1161, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-      1153, /* GL_MAX_VARYING_VECTORS */
-      1070, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1557, /* GL_QUERY_WAIT */
-      1551, /* GL_QUERY_NO_WAIT */
-      1547, /* GL_QUERY_BY_REGION_WAIT */
-      1545, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2150, /* GL_TRANSFORM_FEEDBACK */
-      2159, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2153, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2151, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1541, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-       562, /* GL_FIRST_VERTEX_CONVENTION */
-       825, /* GL_LAST_VERTEX_CONVENTION */
-      1515, /* GL_PROVOKING_VERTEX */
+       918, /* GL_LUMINANCE_INTEGER_EXT */
+       917, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
+      1711, /* GL_RGBA_INTEGER_MODE_EXT */
+       793, /* GL_INT_2_10_10_10_REV */
+       629, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
+       670, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
+       669, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+      1726, /* GL_SAMPLER_1D_ARRAY */
+      1732, /* GL_SAMPLER_2D_ARRAY */
+      1742, /* GL_SAMPLER_BUFFER */
+      1728, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+      1734, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+      1745, /* GL_SAMPLER_CUBE_SHADOW */
+      2233, /* GL_UNSIGNED_INT_VEC2 */
+      2235, /* GL_UNSIGNED_INT_VEC3 */
+      2237, /* GL_UNSIGNED_INT_VEC4 */
+       794, /* GL_INT_SAMPLER_1D */
+       798, /* GL_INT_SAMPLER_2D */
+       804, /* GL_INT_SAMPLER_3D */
+       808, /* GL_INT_SAMPLER_CUBE */
+       802, /* GL_INT_SAMPLER_2D_RECT */
+       795, /* GL_INT_SAMPLER_1D_ARRAY */
+       799, /* GL_INT_SAMPLER_2D_ARRAY */
+       806, /* GL_INT_SAMPLER_BUFFER */
+      2217, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2221, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2227, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2231, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2225, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2218, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2222, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2229, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+       708, /* GL_GEOMETRY_SHADER */
+       711, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+       705, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+       707, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+      1082, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+      1165, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+      1080, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
+      1074, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
+      1078, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
+       881, /* GL_LOW_FLOAT */
+      1167, /* GL_MEDIUM_FLOAT */
+       724, /* GL_HIGH_FLOAT */
+       882, /* GL_LOW_INT */
+      1168, /* GL_MEDIUM_INT */
+       725, /* GL_HIGH_INT */
+      2207, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+       792, /* GL_INT_10_10_10_2_OES */
+      1785, /* GL_SHADER_BINARY_FORMATS */
+      1270, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1786, /* GL_SHADER_COMPILER */
+      1162, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+      1154, /* GL_MAX_VARYING_VECTORS */
+      1071, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+      1558, /* GL_QUERY_WAIT */
+      1552, /* GL_QUERY_NO_WAIT */
+      1548, /* GL_QUERY_BY_REGION_WAIT */
+      1546, /* GL_QUERY_BY_REGION_NO_WAIT */
+      2151, /* GL_TRANSFORM_FEEDBACK */
+      2160, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2154, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2152, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1542, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+       563, /* GL_FIRST_VERTEX_CONVENTION */
+       826, /* GL_LAST_VERTEX_CONVENTION */
+      1516, /* GL_PROVOKING_VERTEX */
        354, /* GL_COPY_READ_BUFFER */
        355, /* GL_COPY_WRITE_BUFFER */
-      1584, /* GL_RED_SNORM */
-      1721, /* GL_RG_SNORM */
-      1720, /* GL_RGB_SNORM */
-      1713, /* GL_RGBA_SNORM */
-      1563, /* GL_R8_SNORM */
-      1633, /* GL_RG8_SNORM */
-      1673, /* GL_RGB8_SNORM */
-      1705, /* GL_RGBA8_SNORM */
-      1561, /* GL_R16_SNORM */
-      1632, /* GL_RG16_SNORM */
-      1649, /* GL_RGB16_SNORM */
-      1685, /* GL_RGBA16_SNORM */
-      1796, /* GL_SIGNED_NORMALIZED */
-      1469, /* GL_PRIMITIVE_RESTART */
-      1470, /* GL_PRIMITIVE_RESTART_INDEX */
-      1637, /* GL_RGB10_A2UI */
-      1126, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1283, /* GL_OBJECT_TYPE */
-      1909, /* GL_SYNC_CONDITION */
-      1914, /* GL_SYNC_STATUS */
-      1911, /* GL_SYNC_FLAGS */
-      1910, /* GL_SYNC_FENCE */
-      1913, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2199, /* GL_UNSIGNALED */
-      1795, /* GL_SIGNALED */
+      1585, /* GL_RED_SNORM */
+      1722, /* GL_RG_SNORM */
+      1721, /* GL_RGB_SNORM */
+      1714, /* GL_RGBA_SNORM */
+      1564, /* GL_R8_SNORM */
+      1634, /* GL_RG8_SNORM */
+      1674, /* GL_RGB8_SNORM */
+      1706, /* GL_RGBA8_SNORM */
+      1562, /* GL_R16_SNORM */
+      1633, /* GL_RG16_SNORM */
+      1650, /* GL_RGB16_SNORM */
+      1686, /* GL_RGBA16_SNORM */
+      1797, /* GL_SIGNED_NORMALIZED */
+      1470, /* GL_PRIMITIVE_RESTART */
+      1471, /* GL_PRIMITIVE_RESTART_INDEX */
+      1638, /* GL_RGB10_A2UI */
+      1127, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1284, /* GL_OBJECT_TYPE */
+      1910, /* GL_SYNC_CONDITION */
+      1915, /* GL_SYNC_STATUS */
+      1912, /* GL_SYNC_FLAGS */
+      1911, /* GL_SYNC_FENCE */
+      1914, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2200, /* GL_UNSIGNALED */
+      1796, /* GL_SIGNALED */
         54, /* GL_ALREADY_SIGNALED */
-      2145, /* GL_TIMEOUT_EXPIRED */
+      2146, /* GL_TIMEOUT_EXPIRED */
        315, /* GL_CONDITION_SATISFIED */
-      2316, /* GL_WAIT_FAILED */
+      2317, /* GL_WAIT_FAILED */
        126, /* GL_BUFFER_ACCESS_FLAGS */
        132, /* GL_BUFFER_MAP_LENGTH */
        133, /* GL_BUFFER_MAP_OFFSET */
-      1156, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-      1071, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
-      1072, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
-      1067, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
+      1157, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+      1072, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
+      1073, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
+      1068, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
        330, /* GL_CONTEXT_PROFILE_MASK */
-       712, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
-       547, /* GL_EVAL_BIT */
-      1566, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       872, /* GL_LIST_BIT */
-      2017, /* GL_TEXTURE_BIT */
-      1765, /* GL_SCISSOR_BIT */
+       713, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
+       548, /* GL_EVAL_BIT */
+      1567, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       873, /* GL_LIST_BIT */
+      2018, /* GL_TEXTURE_BIT */
+      1766, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
-      1232, /* GL_MULTISAMPLE_BIT */
+      1233, /* 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 8ebc05139..b02a49de4 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -219,6 +219,7 @@ static const struct extension extension_table[] = {
    { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },
    { "GL_OES_blend_subtract",                      o(dummy_true),                                   ES1,       2009 },
    { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },
+   { "GL_OES_compressed_ETC1_RGB8_texture",        o(OES_compressed_ETC1_RGB8_texture),             ES1 | ES2, 2005 },
    { "GL_OES_compressed_paletted_texture",         o(dummy_true),                                   ES1,       2003 },
    { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
    { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },
diff --git a/mesalib/src/mesa/main/format_unpack.c b/mesalib/src/mesa/main/format_unpack.c
index 0ab694014..f821c2be4 100644
--- a/mesalib/src/mesa/main/format_unpack.c
+++ b/mesalib/src/mesa/main/format_unpack.c
@@ -275,10 +275,11 @@ unpack_ARGB1555_REV(const void *src, GLfloat dst[][4], GLuint n)
    const GLushort *s = ((const GLushort *) src);
    GLuint i;
    for (i = 0; i < n; i++) {
-      dst[i][RCOMP] = UBYTE_TO_FLOAT( ((s[i] >>  7) & 0xf8) | ((s[i] >> 12) & 0x7) );
-      dst[i][GCOMP] = UBYTE_TO_FLOAT( ((s[i] >>  2) & 0xf8) | ((s[i] >>  7) & 0x7) );
-      dst[i][BCOMP] = UBYTE_TO_FLOAT( ((s[i] <<  3) & 0xf8) | ((s[i] >>  2) & 0x7) );
-      dst[i][ACOMP] = UBYTE_TO_FLOAT( ((s[i] >> 15) & 0x01) * 255 );
+      GLushort tmp = (s[i] << 8) | (s[i] >> 8); /* byteswap */
+      dst[i][RCOMP] = ((tmp >> 10) & 0x1f) * (1.0F / 31.0F);
+      dst[i][GCOMP] = ((tmp >>  5) & 0x1f) * (1.0F / 31.0F);
+      dst[i][BCOMP] = ((tmp >>  0) & 0x1f) * (1.0F / 31.0F);
+      dst[i][ACOMP] = ((tmp >> 15) & 0x01) * 1.0F;
    }
 }
 
@@ -503,7 +504,7 @@ unpack_R8(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
-unpack_RG88(const void *src, GLfloat dst[][4], GLuint n)
+unpack_GR88(const void *src, GLfloat dst[][4], GLuint n)
 {
    const GLushort *s = ((const GLushort *) src);
    GLuint i;
@@ -516,13 +517,13 @@ unpack_RG88(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
-unpack_RG88_REV(const void *src, GLfloat dst[][4], GLuint n)
+unpack_RG88(const void *src, GLfloat dst[][4], GLuint n)
 {
    const GLushort *s = ((const GLushort *) src);
    GLuint i;
    for (i = 0; i < n; i++) {
-      dst[i][RCOMP] = UBYTE_TO_FLOAT( s[i] & 0xff );
-      dst[i][GCOMP] = UBYTE_TO_FLOAT( s[i] >> 8 );
+      dst[i][RCOMP] = UBYTE_TO_FLOAT( s[i] >> 8 );
+      dst[i][GCOMP] = UBYTE_TO_FLOAT( s[i] & 0xff );
       dst[i][BCOMP] = 0.0;
       dst[i][ACOMP] = 1.0;
    }
@@ -749,13 +750,13 @@ unpack_SL8(const void *src, GLfloat dst[][4], GLuint n)
 static void
 unpack_SLA8(const void *src, GLfloat dst[][4], GLuint n)
 {
-   const GLubyte *s = (const GLubyte *) src;
+   const GLushort *s = (const GLushort *) src;
    GLuint i;
    for (i = 0; i < n; i++) {
       dst[i][RCOMP] =
       dst[i][GCOMP] =
-      dst[i][BCOMP] = nonlinear_to_linear(s[i*2+0]);
-      dst[i][ACOMP] = UBYTE_TO_FLOAT(s[i*2+1]); /* linear! */
+      dst[i][BCOMP] = nonlinear_to_linear(s[i] & 0xff);
+      dst[i][ACOMP] = UBYTE_TO_FLOAT(s[i] >> 8); /* linear! */
    }
 }
 
@@ -1194,8 +1195,8 @@ unpack_SIGNED_GR1616(const void *src, GLfloat dst[][4], GLuint n)
    const GLuint *s = ((const GLuint *) src);
    GLuint i;
    for (i = 0; i < n; i++) {
-      dst[i][RCOMP] = SHORT_TO_FLOAT_TEX( s[i] & 0xffff );
-      dst[i][GCOMP] = SHORT_TO_FLOAT_TEX( s[i] >> 16 );
+      dst[i][RCOMP] = SHORT_TO_FLOAT_TEX( (GLshort) (s[i] & 0xffff) );
+      dst[i][GCOMP] = SHORT_TO_FLOAT_TEX( (GLshort) (s[i] >> 16) );
       dst[i][BCOMP] = 0.0F;
       dst[i][ACOMP] = 1.0F;
    }
@@ -1289,6 +1290,12 @@ unpack_SIGNED_LA_LATC2(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
+unpack_ETC1_RGB8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   /* XXX to do */
+}
+
+static void
 unpack_SIGNED_A8(const void *src, GLfloat dst[][4], GLuint n)
 {
    const GLbyte *s = ((const GLbyte *) src);
@@ -1459,8 +1466,8 @@ get_unpack_rgba_function(gl_format format)
       table[MESA_FORMAT_YCBCR] = unpack_YCBCR;
       table[MESA_FORMAT_YCBCR_REV] = unpack_YCBCR_REV;
       table[MESA_FORMAT_R8] = unpack_R8;
+      table[MESA_FORMAT_GR88] = unpack_GR88;
       table[MESA_FORMAT_RG88] = unpack_RG88;
-      table[MESA_FORMAT_RG88_REV] = unpack_RG88_REV;
       table[MESA_FORMAT_R16] = unpack_R16;
       table[MESA_FORMAT_RG1616] = unpack_RG1616;
       table[MESA_FORMAT_RG1616_REV] = unpack_RG1616_REV;
@@ -1535,6 +1542,8 @@ get_unpack_rgba_function(gl_format format)
       table[MESA_FORMAT_LA_LATC2] = unpack_LA_LATC2;
       table[MESA_FORMAT_SIGNED_LA_LATC2] = unpack_SIGNED_LA_LATC2;
 
+      table[MESA_FORMAT_ETC1_RGB8] = unpack_ETC1_RGB8;
+
       table[MESA_FORMAT_SIGNED_A8] = unpack_SIGNED_A8;
       table[MESA_FORMAT_SIGNED_L8] = unpack_SIGNED_L8;
       table[MESA_FORMAT_SIGNED_AL88] = unpack_SIGNED_AL88;
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index d3b12d008..595da773b 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -375,8 +375,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_RG88,
-      "MESA_FORMAT_RG88",
+      MESA_FORMAT_GR88,
+      "MESA_FORMAT_GR88",
       GL_RG,
       GL_UNSIGNED_NORMALIZED,
       8, 8, 0, 0,
@@ -384,8 +384,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_RG88_REV,
-      "MESA_FORMAT_RG88_REV",
+      MESA_FORMAT_RG88,
+      "MESA_FORMAT_RG88",
       GL_RG,
       GL_UNSIGNED_NORMALIZED,
       8, 8, 0, 0,
@@ -1386,6 +1386,16 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 16                     /* 16 bytes per 4x4 block */
    },
 
+   {
+      MESA_FORMAT_ETC1_RGB8,
+      "MESA_FORMAT_ETC1_RGB8",
+      GL_RGB,
+      GL_UNSIGNED_NORMALIZED,
+      8, 8, 8, 0,
+      0, 0, 0, 0, 0,
+      4, 4, 8                     /* 8 bytes per 4x4 block */
+   },
+
    /* Signed formats from EXT_texture_snorm that are not in GL3.1 */
    {
       MESA_FORMAT_SIGNED_A8,
@@ -1491,7 +1501,10 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       MESA_FORMAT_Z32_FLOAT_X24S8, /* Name */
       "MESA_FORMAT_Z32_FLOAT_X24S8", /* StrName */
       GL_DEPTH_STENCIL,            /* BaseFormat */
-      GL_NONE /* XXX */,           /* DataType */
+      /* DataType here is used to answer GL_TEXTURE_DEPTH_TYPE queries, and is
+       * never used for stencil because stencil is always GL_UNSIGNED_INT.
+       */
+      GL_FLOAT,                    /* DataType */
       0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
       0, 0, 0, 32, 8,              /* Lum/Int/Index/Depth/StencilBits */
       1, 1, 8                      /* BlockWidth/Height,Bytes */
@@ -1776,7 +1789,7 @@ _mesa_get_uncompressed_format(gl_format format)
    case MESA_FORMAT_SIGNED_RED_RGTC1:
       return MESA_FORMAT_SIGNED_R8;
    case MESA_FORMAT_RG_RGTC2:
-      return MESA_FORMAT_RG88;
+      return MESA_FORMAT_GR88;
    case MESA_FORMAT_SIGNED_RG_RGTC2:
       return MESA_FORMAT_SIGNED_RG88_REV;
    case MESA_FORMAT_L_LATC1:
@@ -1787,6 +1800,8 @@ _mesa_get_uncompressed_format(gl_format format)
       return MESA_FORMAT_AL88;
    case MESA_FORMAT_SIGNED_LA_LATC2:
       return MESA_FORMAT_SIGNED_AL88;
+   case MESA_FORMAT_ETC1_RGB8:
+      return MESA_FORMAT_RGB888;
    default:
 #ifdef DEBUG
       assert(!_mesa_is_format_compressed(format));
@@ -2061,8 +2076,8 @@ _mesa_format_to_type_and_comps(gl_format format,
 
    case MESA_FORMAT_AL88:
    case MESA_FORMAT_AL88_REV:
+   case MESA_FORMAT_GR88:
    case MESA_FORMAT_RG88:
-   case MESA_FORMAT_RG88_REV:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 2;
       return;
@@ -2237,6 +2252,7 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_SIGNED_L_LATC1:
    case MESA_FORMAT_LA_LATC2:
    case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_ETC1_RGB8:
       /* XXX generate error instead? */
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 0;
@@ -2595,9 +2611,9 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
 
    case MESA_FORMAT_R8:
       return format == GL_RED && type == GL_UNSIGNED_BYTE;
+   case MESA_FORMAT_GR88:
+      return format == GL_RG && type == GL_UNSIGNED_BYTE && littleEndian;
    case MESA_FORMAT_RG88:
-      return format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE && littleEndian;
-   case MESA_FORMAT_RG88_REV:
       return GL_FALSE;
 
    case MESA_FORMAT_R16:
@@ -2774,6 +2790,9 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
    case MESA_FORMAT_SIGNED_LA_LATC2:
       return GL_FALSE;
 
+   case MESA_FORMAT_ETC1_RGB8:
+      return GL_FALSE;
+
    case MESA_FORMAT_SIGNED_A8:
    case MESA_FORMAT_SIGNED_L8:
    case MESA_FORMAT_SIGNED_AL88:
diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index b22b07338..3960f028e 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -91,8 +91,8 @@ typedef enum
    MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
    MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
    MESA_FORMAT_R8,		/*                               RRRR RRRR */
-   MESA_FORMAT_RG88,		/*                     GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_RG88_REV,	/*                     RRRR RRRR GGGG GGGG */
+   MESA_FORMAT_GR88,		/*                     GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_RG88,    	/*                     RRRR RRRR GGGG GGGG */
    MESA_FORMAT_R16,		/*                     RRRR RRRR RRRR RRRR */
    MESA_FORMAT_RG1616,		/* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
    MESA_FORMAT_RG1616_REV,	/* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
@@ -250,6 +250,8 @@ typedef enum
    MESA_FORMAT_SIGNED_LA_LATC2,
    /*@}*/
 
+   MESA_FORMAT_ETC1_RGB8,
+
    MESA_FORMAT_SIGNED_A8,         /*                               AAAA AAAA */
    MESA_FORMAT_SIGNED_L8,         /*                               LLLL LLLL */
    MESA_FORMAT_SIGNED_AL88,       /*                     AAAA AAAA LLLL LLLL */
diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h
index 7980111b5..315232371 100644
--- a/mesalib/src/mesa/main/glheader.h
+++ b/mesalib/src/mesa/main/glheader.h
@@ -139,6 +139,10 @@ typedef void *GLeglImageOES;
 #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837
 #endif
 
+#ifndef GL_OES_compressed_ETC1_RGB8_texture
+#define GL_ETC1_RGB8_OES                                        0x8D64
+#endif
+
 
 /**
  * Internal token to represent a GLSL shader program (a collection of
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index 9b9e83802..b266e26c6 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -741,6 +741,7 @@ _mesa_is_color_format(GLenum format)
       case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
       case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
       case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
+      case GL_ETC1_RGB8_OES:
       /* generic integer formats */
       case GL_RED_INTEGER_EXT:
       case GL_GREEN_INTEGER_EXT:
@@ -853,7 +854,6 @@ _mesa_is_stencil_format(GLenum format)
 {
    switch (format) {
       case GL_STENCIL_INDEX:
-      case GL_DEPTH_STENCIL:
          return GL_TRUE;
       default:
          return GL_FALSE;
@@ -1051,6 +1051,8 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
       return ctx->Extensions.EXT_texture_compression_latc;
    case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
       return ctx->Extensions.ATI_texture_compression_3dc;
+   case GL_ETC1_RGB8_OES:
+      return ctx->Extensions.OES_compressed_ETC1_RGB8_texture;
 #if FEATURE_ES
    case GL_PALETTE4_RGB8_OES:
    case GL_PALETTE4_RGBA8_OES:
diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index c621800c0..fd6e582ec 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -2048,6 +2048,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
       dstImage = _mesa_get_tex_image(ctx, texObj, target, level + 1);
       if (!dstImage) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
+         free(temp_dst);
          return;
       }
 
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 08cd80a7f..33b00c680 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2979,6 +2979,7 @@ struct gl_extensions
    GLboolean OES_EGL_image;
    GLboolean OES_draw_texture;
    GLboolean OES_EGL_image_external;
+   GLboolean OES_compressed_ETC1_RGB8_texture;
    GLboolean extension_sentinel;
    /** The extension string */
    const GLubyte *String;
diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c
index 4754d34c6..0bd4ff199 100644
--- a/mesalib/src/mesa/main/pack.c
+++ b/mesalib/src/mesa/main/pack.c
@@ -3611,70 +3611,6 @@ _mesa_unpack_color_span_ubyte(struct gl_context *ctx,
             return;
          }
       }
-      /*
-       * Common situation, loading 8bit RGBA/RGB source images
-       * into 16/32 bit destination. (OSMesa16/32)
-       */
-      else if (srcType == GL_UNSIGNED_BYTE) {
-         if (dstFormat == GL_RGBA) {
-            if (srcFormat == GL_RGB) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLubyte *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = src[0];
-                  dst[1] = src[1];
-                  dst[2] = src[2];
-                  dst[3] = 255;
-                  src += 3;
-                  dst += 4;
-               }
-               return;
-            }
-            else if (srcFormat == GL_RGBA) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLubyte *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = src[0];
-                  dst[1] = src[1];
-                  dst[2] = src[2];
-                  dst[3] = src[3];
-                  src += 4;
-                  dst += 4;
-               }
-               return;
-             }
-         }
-         else if (dstFormat == GL_RGB) {
-            if (srcFormat == GL_RGB) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLubyte *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = src[0];
-                  dst[1] = src[1];
-                  dst[2] = src[2];
-                  src += 3;
-                  dst += 3;
-               }
-               return;
-            }
-            else if (srcFormat == GL_RGBA) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLubyte *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = src[0];
-                  dst[1] = src[1];
-                  dst[2] = src[2];
-                  src += 4;
-                  dst += 3;
-               }
-               return;
-            }
-         }
-      }
    }
 
 
diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index c9a16a989..24060e695 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -1015,7 +1015,7 @@ get_values_r8(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
 }
 
 /**********************************************************************
- * Functions for MESA_FORMAT_RG88.
+ * Functions for MESA_FORMAT_GR88.
  */
 static void
 get_row_rg88(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
@@ -1422,7 +1422,7 @@ _mesa_set_renderbuffer_accessors(struct gl_renderbuffer *rb)
       rb->PutMonoValues = put_mono_values_generic;
       break;
 
-   case MESA_FORMAT_RG88:
+   case MESA_FORMAT_GR88:
       rb->DataType = GL_UNSIGNED_BYTE;
       rb->GetValues = get_values_rg88;
       rb->GetRow = get_row_rg88;
diff --git a/mesalib/src/mesa/main/shader_query.cpp b/mesalib/src/mesa/main/shader_query.cpp
index 38bacdb74..8ab18126c 100644
--- a/mesalib/src/mesa/main/shader_query.cpp
+++ b/mesalib/src/mesa/main/shader_query.cpp
@@ -107,8 +107,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
 
       if (var == NULL
 	  || var->mode != ir_var_in
-	  || var->location == -1
-	  || var->location < VERT_ATTRIB_GENERIC0)
+	  || var->location == -1)
 	 continue;
 
       if (current_index == desired_index) {
@@ -199,8 +198,7 @@ _mesa_count_active_attribs(struct gl_shader_program *shProg)
 
       if (var == NULL
 	  || var->mode != ir_var_in
-	  || var->location == -1
-	  || var->location < VERT_ATTRIB_GENERIC0)
+	  || var->location == -1)
 	 continue;
 
       i++;
@@ -226,8 +224,7 @@ _mesa_longest_attribute_name_length(struct gl_shader_program *shProg)
 
       if (var == NULL
 	  || var->mode != ir_var_in
-	  || var->location == -1
-	  || var->location < VERT_ATTRIB_GENERIC0)
+	  || var->location == -1)
 	 continue;
 
       const size_t len = strlen(var->name);
diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index 0458b9b68..5045aef06 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -40,6 +40,7 @@
 #include "texcompress_fxt1.h"
 #include "texcompress_rgtc.h"
 #include "texcompress_s3tc.h"
+#include "texcompress_etc.h"
 #include "swrast/s_context.h"
 
 
@@ -90,6 +91,7 @@ _mesa_gl_compressed_format_base_format(GLenum format)
    case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
    case GL_COMPRESSED_RGB_FXT1_3DFX:
    case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
+   case GL_ETC1_RGB8_OES:
       return GL_RGB;
 
    case GL_COMPRESSED_RGBA:
@@ -264,6 +266,15 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
       }
    }
 
+   if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {
+      if (formats) {
+         formats[n++] = GL_ETC1_RGB8_OES;
+      }
+      else {
+         n += 1;
+      }
+   }
+
 #if FEATURE_ES1
    if (ctx->API == API_OPENGLES) {
       if (formats) {
@@ -341,6 +352,9 @@ _mesa_glenum_to_compressed_format(GLenum format)
    case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
       return MESA_FORMAT_SIGNED_LA_LATC2;
 
+   case GL_ETC1_RGB8_OES:
+      return MESA_FORMAT_ETC1_RGB8;
+
    default:
       return MESA_FORMAT_NONE;
    }
@@ -406,6 +420,9 @@ _mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)
    case MESA_FORMAT_SIGNED_LA_LATC2:
       return GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT;
 
+   case MESA_FORMAT_ETC1_RGB8:
+      return GL_ETC1_RGB8_OES;
+
    default:
       _mesa_problem(ctx, "Unexpected mesa texture format in"
                     " _mesa_compressed_format_to_glenum()");
@@ -515,6 +532,11 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height,
       fetch = _mesa_fetch_texel_2d_f_signed_la_latc2;
       break;
 
+   /* ETC1 formats */
+   case MESA_FORMAT_ETC1_RGB8:
+      fetch = _mesa_fetch_texel_2d_f_etc1_rgb8;
+      break;
+
    default:
       _mesa_problem(NULL, "Unexpected format in _mesa_decompress_image()");
       return;
diff --git a/mesalib/src/mesa/main/texcompress_etc.c b/mesalib/src/mesa/main/texcompress_etc.c
new file mode 100644
index 000000000..4d3b857cf
--- /dev/null
+++ b/mesalib/src/mesa/main/texcompress_etc.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2011 LunarG, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file texcompress_etc.c
+ * GL_OES_compressed_ETC1_RGB8_texture support.
+ */
+
+
+#include "mfeatures.h"
+#include "texcompress.h"
+#include "texcompress_etc.h"
+#include "texstore.h"
+#include "macros.h"
+#include "swrast/s_context.h"
+
+GLboolean
+_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS)
+{
+   /* GL_ETC1_RGB8_OES is only valid in glCompressedTexImage2D */
+   ASSERT(0);
+
+   return GL_FALSE;
+}
+
+/* define etc1_parse_block and etc. */
+#define UINT8_TYPE GLubyte
+#define TAG(x) x
+#include "texcompress_etc_tmp.h"
+#undef TAG
+#undef UINT8_TYPE
+
+void
+_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   struct etc1_block block;
+   GLubyte dst[3];
+   const GLubyte *src;
+
+   src = (const GLubyte *) texImage->Data +
+      (((texImage->RowStride + 3) / 4) * (j / 4) + (i / 4)) * 8;
+
+   etc1_parse_block(&block, src);
+   etc1_fetch_texel(&block, i % 4, j % 4, dst);
+
+   texel[RCOMP] = UBYTE_TO_FLOAT(dst[0]);
+   texel[GCOMP] = UBYTE_TO_FLOAT(dst[1]);
+   texel[BCOMP] = UBYTE_TO_FLOAT(dst[2]);
+   texel[ACOMP] = 1.0f;
+}
diff --git a/mesalib/src/mesa/main/texcompress_etc.h b/mesalib/src/mesa/main/texcompress_etc.h
new file mode 100644
index 000000000..4e166b2b1
--- /dev/null
+++ b/mesalib/src/mesa/main/texcompress_etc.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 LunarG, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef TEXCOMPRESS_ETC1_H
+#define TEXCOMPRESS_ETC1_H
+
+#include "glheader.h"
+#include "mfeatures.h"
+#include "texstore.h"
+
+struct swrast_texture_image;
+
+extern GLboolean
+_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS);
+
+extern void
+_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, GLfloat *texel);
+
+#endif
diff --git a/mesalib/src/mesa/main/texcompress_etc_tmp.h b/mesalib/src/mesa/main/texcompress_etc_tmp.h
new file mode 100644
index 000000000..5c8c6decf
--- /dev/null
+++ b/mesalib/src/mesa/main/texcompress_etc_tmp.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2011 LunarG, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Included by texcompress_etc1 and gallium to define ETC1 decoding routines.
+ */
+
+struct TAG(etc1_block) {
+   uint32_t pixel_indices;
+   int flipped;
+   const int *modifier_tables[2];
+   UINT8_TYPE base_colors[2][3];
+};
+
+static UINT8_TYPE
+TAG(etc1_base_color_diff_hi)(UINT8_TYPE in)
+{
+   return (in & 0xf8) | (in >> 5);
+}
+
+static UINT8_TYPE
+TAG(etc1_base_color_diff_lo)(UINT8_TYPE in)
+{
+   static const int lookup[8] = { 0, 1, 2, 3, -4, -3, -2, -1 };
+
+   in = (in >> 3) + lookup[in & 0x7];
+
+   return (in << 3) | (in >> 2);
+}
+
+static UINT8_TYPE
+TAG(etc1_base_color_ind_hi)(UINT8_TYPE in)
+{
+   return (in & 0xf0) | ((in & 0xf0) >> 4);
+}
+
+static UINT8_TYPE
+TAG(etc1_base_color_ind_lo)(UINT8_TYPE in)
+{
+   return ((in & 0xf) << 4) | (in & 0xf);
+}
+
+static UINT8_TYPE
+TAG(etc1_clamp)(UINT8_TYPE base, int modifier)
+{
+   int tmp = (int) base + modifier;
+
+   /* CLAMP(tmp, 0, 255) */
+   return (UINT8_TYPE) ((tmp < 0) ? 0 : ((tmp > 255) ? 255 : tmp));
+}
+
+static const int TAG(etc1_modifier_tables)[8][4] = {
+   {  2,   8,  -2,   -8},
+   {  5,  17,  -5,  -17},
+   {  9,  29,  -9,  -29},
+   { 13,  42, -13,  -42},
+   { 18,  60, -18,  -60},
+   { 24,  80, -24,  -80},
+   { 33, 106, -33, -106},
+   { 47, 183, -47, -183}
+};
+
+static void
+TAG(etc1_parse_block)(struct TAG(etc1_block) *block, const UINT8_TYPE *src)
+{
+   if (src[3] & 0x2) {
+      /* differential mode */
+      block->base_colors[0][0] = (int) TAG(etc1_base_color_diff_hi)(src[0]);
+      block->base_colors[1][0] = (int) TAG(etc1_base_color_diff_lo)(src[0]);
+      block->base_colors[0][1] = (int) TAG(etc1_base_color_diff_hi)(src[1]);
+      block->base_colors[1][1] = (int) TAG(etc1_base_color_diff_lo)(src[1]);
+      block->base_colors[0][2] = (int) TAG(etc1_base_color_diff_hi)(src[2]);
+      block->base_colors[1][2] = (int) TAG(etc1_base_color_diff_lo)(src[2]);
+   }
+   else {
+      /* individual mode */
+      block->base_colors[0][0] = (int) TAG(etc1_base_color_ind_hi)(src[0]);
+      block->base_colors[1][0] = (int) TAG(etc1_base_color_ind_lo)(src[0]);
+      block->base_colors[0][1] = (int) TAG(etc1_base_color_ind_hi)(src[1]);
+      block->base_colors[1][1] = (int) TAG(etc1_base_color_ind_lo)(src[1]);
+      block->base_colors[0][2] = (int) TAG(etc1_base_color_ind_hi)(src[2]);
+      block->base_colors[1][2] = (int) TAG(etc1_base_color_ind_lo)(src[2]);
+   }
+
+   /* pick modifier tables */
+   block->modifier_tables[0] = TAG(etc1_modifier_tables)[(src[3] >> 5) & 0x7];
+   block->modifier_tables[1] = TAG(etc1_modifier_tables)[(src[3] >> 2) & 0x7];
+
+   block->flipped = (src[3] & 0x1);
+
+   block->pixel_indices =
+      (src[4] << 24) | (src[5] << 16) | (src[6] << 8) | src[7];
+}
+
+static void
+TAG(etc1_fetch_texel)(const struct TAG(etc1_block) *block,
+      int x, int y, UINT8_TYPE *dst)
+{
+   const UINT8_TYPE *base_color;
+   int modifier, bit, idx, blk;
+
+   /* get pixel index */
+   bit = y + x * 4;
+   idx = ((block->pixel_indices >> (15 + bit)) & 0x2) |
+         ((block->pixel_indices >>      (bit)) & 0x1);
+
+   /* get subblock */
+   blk = (block->flipped) ? (y >= 2) : (x >= 2);
+
+   base_color = block->base_colors[blk];
+   modifier = block->modifier_tables[blk][idx];
+
+   dst[0] = TAG(etc1_clamp)(base_color[0], modifier);
+   dst[1] = TAG(etc1_clamp)(base_color[1], modifier);
+   dst[2] = TAG(etc1_clamp)(base_color[2], modifier);
+}
diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 6d8e272ba..c776b4160 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -763,12 +763,12 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
 
       case GL_RG:
       case GL_RG8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);
+	 RETURN_IF_SUPPORTED(MESA_FORMAT_GR88);
 	 break;
 
       case GL_COMPRESSED_RG:
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);
+	 RETURN_IF_SUPPORTED(MESA_FORMAT_GR88);
 	 break;
 
       case GL_RG16:
@@ -919,6 +919,16 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       }
    }
 
+   if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {
+      switch (internalFormat) {
+         case GL_ETC1_RGB8_OES:
+            RETURN_IF_SUPPORTED(MESA_FORMAT_ETC1_RGB8);
+            break;
+         default:
+            ; /* fallthrough */
+      }
+   }
+
    _mesa_problem(ctx, "unexpected format %s in _mesa_choose_tex_format()",
                  _mesa_lookup_enum_by_nr(internalFormat));
    return MESA_FORMAT_NONE;
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 2bc7abdc2..99905de3a 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -493,6 +493,15 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
       }
    }
 
+   if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {
+      switch (internalFormat) {
+      case GL_ETC1_RGB8_OES:
+         return GL_RGB;
+      default:
+         ; /* fallthrough */
+      }
+   }
+
    if (ctx->API == API_OPENGLES) {
       switch (internalFormat) {
       case GL_PALETTE4_RGB8_OES:
@@ -1292,6 +1301,20 @@ legal_texture_size(struct gl_context *ctx, gl_format format,
 }
 
 
+/**
+ * Return true if the format is only valid for glCompressedTexImage.
+ */
+static GLboolean
+compressedteximage_only_format(const struct gl_context *ctx, GLenum format)
+{
+   switch (format) {
+   case GL_ETC1_RGB8_OES:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
 
 /**
  * Helper function to determine whether a target and specific compression
@@ -1639,6 +1662,11 @@ texture_error_check( struct gl_context *ctx,
                         "glTexImage%dD(target)", dimensions);
          return GL_TRUE;
       }
+      if (compressedteximage_only_format(ctx, internalFormat)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glTexImage%dD(no compression for format)", dimensions);
+         return GL_TRUE;
+      }
       if (border != 0) {
          if (!isProxy) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -1793,6 +1821,12 @@ subtexture_error_check2( struct gl_context *ctx, GLuint dimensions,
    if (_mesa_is_format_compressed(destTex->TexFormat)) {
       GLuint bw, bh;
 
+      if (compressedteximage_only_format(ctx, destTex->InternalFormat)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glTexSubImage%dD(no compression for format)", dimensions);
+         return GL_TRUE;
+      }
+
       /* do tests which depend on compression block size */
       _mesa_get_format_block_size(destTex->TexFormat, &bw, &bh);
 
@@ -1922,6 +1956,11 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
                      "glCopyTexImage%dD(target)", dimensions);
          return GL_TRUE;
       }
+      if (compressedteximage_only_format(ctx, internalFormat)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glCopyTexImage%dD(no compression for format)", dimensions);
+         return GL_TRUE;
+      }
       if (border != 0) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glCopyTexImage%dD(border!=0)", dimensions);
@@ -2061,6 +2100,11 @@ copytexsubimage_error_check2( struct gl_context *ctx, GLuint dimensions,
    }
 
    if (_mesa_is_format_compressed(teximage->TexFormat)) {
+      if (compressedteximage_only_format(ctx, teximage->InternalFormat)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glCopyTexSubImage%dD(no compression for format)", dimensions);
+         return GL_TRUE;
+      }
       /* offset must be multiple of 4 */
       if ((xoffset & 3) || (yoffset & 3)) {
          _mesa_error(ctx, GL_INVALID_VALUE,
@@ -3244,6 +3288,13 @@ compressed_subtexture_error_check2(struct gl_context *ctx, GLuint dims,
       return GL_TRUE;
    }
 
+   if (compressedteximage_only_format(ctx, format)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCompressedTexSubImage%uD(format=0x%x cannot be updated)"
+                  , dims, format);
+      return GL_TRUE;
+   }
+
    if (((width == 1 || width == 2) &&
         width != (GLsizei) texImage->Width) ||
        (width > (GLsizei) texImage->Width)) {
@@ -3310,14 +3361,9 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
                                           internalFormat, width, height, depth,
                                           border, imageSize, &reason);
 
-   if (error) {
-      _mesa_error(ctx, error, "glCompressedTexImage%uD(%s)", dims, reason);
-      return;
-   }
-
 #if FEATURE_ES
    /* XXX this is kind of a hack */
-   if (dims == 2) {
+   if (!error && dims == 2) {
       switch (internalFormat) {
       case GL_PALETTE4_RGB8_OES:
       case GL_PALETTE4_RGBA8_OES:
@@ -3371,7 +3417,7 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
       struct gl_texture_image *texImage;
 
       if (error) {
-         _mesa_error(ctx, error, "glCompressedTexImage%uD", dims);
+         _mesa_error(ctx, error, "glCompressedTexImage%uD(%s)", dims, reason);
          return;
       }
 
diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 007959077..37fea2156 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -67,6 +67,7 @@
 #include "texcompress_fxt1.h"
 #include "texcompress_rgtc.h"
 #include "texcompress_s3tc.h"
+#include "texcompress_etc.h"
 #include "teximage.h"
 #include "texstore.h"
 #include "enums.h"
@@ -2141,8 +2142,8 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
 
    ASSERT(dstFormat == MESA_FORMAT_AL88 ||
           dstFormat == MESA_FORMAT_AL88_REV ||
-          dstFormat == MESA_FORMAT_RG88 ||
-          dstFormat == MESA_FORMAT_RG88_REV);
+          dstFormat == MESA_FORMAT_GR88 ||
+          dstFormat == MESA_FORMAT_RG88);
    ASSERT(texelBytes == 2);
 
    if (!ctx->_ImageTransferState &&
@@ -2150,7 +2151,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
        ((dstFormat == MESA_FORMAT_AL88 &&
          baseInternalFormat == GL_LUMINANCE_ALPHA &&
          srcFormat == GL_LUMINANCE_ALPHA) ||
-        (dstFormat == MESA_FORMAT_RG88 &&
+        (dstFormat == MESA_FORMAT_GR88 &&
          baseInternalFormat == srcFormat)) &&
        srcType == GL_UNSIGNED_BYTE &&
        littleEndian) {
@@ -2182,8 +2183,8 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
 	 }
       }
       else {
-	 if ((littleEndian && dstFormat == MESA_FORMAT_RG88) ||
-	     (!littleEndian && dstFormat == MESA_FORMAT_RG88_REV)) {
+	 if ((littleEndian && dstFormat == MESA_FORMAT_GR88) ||
+	     (!littleEndian && dstFormat == MESA_FORMAT_RG88)) {
 	    dstmap[0] = 0;
 	    dstmap[1] = 1;
 	 }
@@ -2224,7 +2225,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
          for (row = 0; row < srcHeight; row++) {
             GLushort *dstUS = (GLushort *) dstRow;
             if (dstFormat == MESA_FORMAT_AL88 ||
-		dstFormat == MESA_FORMAT_RG88) {
+		dstFormat == MESA_FORMAT_GR88) {
                for (col = 0; col < srcWidth; col++) {
                   /* src[0] is luminance (or R), src[1] is alpha (or G) */
                  dstUS[col] = PACK_COLOR_88( src[1],
@@ -4374,8 +4375,8 @@ _mesa_get_texstore_func(gl_format format)
       table[MESA_FORMAT_YCBCR] = _mesa_texstore_ycbcr;
       table[MESA_FORMAT_YCBCR_REV] = _mesa_texstore_ycbcr;
       table[MESA_FORMAT_R8] = _mesa_texstore_unorm8;
+      table[MESA_FORMAT_GR88] = _mesa_texstore_unorm88;
       table[MESA_FORMAT_RG88] = _mesa_texstore_unorm88;
-      table[MESA_FORMAT_RG88_REV] = _mesa_texstore_unorm88;
       table[MESA_FORMAT_R16] = _mesa_texstore_unorm16;
       table[MESA_FORMAT_RG1616] = _mesa_texstore_unorm1616;
       table[MESA_FORMAT_RG1616_REV] = _mesa_texstore_unorm1616;
@@ -4437,6 +4438,7 @@ _mesa_get_texstore_func(gl_format format)
       table[MESA_FORMAT_SIGNED_L_LATC1] = _mesa_texstore_signed_red_rgtc1;
       table[MESA_FORMAT_LA_LATC2] = _mesa_texstore_rg_rgtc2;
       table[MESA_FORMAT_SIGNED_LA_LATC2] = _mesa_texstore_signed_rg_rgtc2;
+      table[MESA_FORMAT_ETC1_RGB8] = _mesa_texstore_etc1_rgb8;
       table[MESA_FORMAT_SIGNED_A8] = _mesa_texstore_snorm8;
       table[MESA_FORMAT_SIGNED_L8] = _mesa_texstore_snorm8;
       table[MESA_FORMAT_SIGNED_AL88] = _mesa_texstore_snorm88;
@@ -4832,7 +4834,7 @@ _mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level,
    if (!pixels)
       return;
 
-   /* Map dest texture buffer (write to whole region) */
+   /* Map dest texture buffer */
    ctx->Driver.MapTextureImage(ctx, texImage, 0,
                                xoffset, 0, width, 1,
                                rwMode,
@@ -4885,7 +4887,7 @@ _mesa_store_texsubimage2d(struct gl_context *ctx, GLenum target, GLint level,
    if (!pixels)
       return;
 
-   /* Map dest texture buffer (write to whole region) */
+   /* Map dest texture buffer */
    ctx->Driver.MapTextureImage(ctx, texImage, 0,
                                xoffset, yoffset, width, height,
                                rwMode,
@@ -5015,11 +5017,9 @@ _mesa_store_compressed_teximage2d(struct gl_context *ctx,
                                   struct gl_texture_object *texObj,
                                   struct gl_texture_image *texImage)
 {
-   GLubyte *dstMap;
-   GLint dstRowStride;
-
-   /* This is pretty simple, basically just do a memcpy without worrying
-    * about the usual image unpacking or image transfer operations.
+   /* This is pretty simple, because unlike the general texstore path we don't
+    * have to worry about the usual image unpacking or image transfer
+    * operations.
     */
    ASSERT(texObj);
    ASSERT(texImage);
@@ -5034,29 +5034,12 @@ _mesa_store_compressed_teximage2d(struct gl_context *ctx,
       return;
    }
 
-   data = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, data,
-                                                 &ctx->Unpack,
-                                                 "glCompressedTexImage2D");
-   if (!data)
-      return;
-
-
-   /* Map dest texture buffer (write to whole region) */
-   ctx->Driver.MapTextureImage(ctx, texImage, 0,
-                               0, 0, width, height,
-                               GL_MAP_WRITE_BIT,
-                               &dstMap, &dstRowStride);
-   if (dstMap) {
-      /* copy the data */
-      memcpy(dstMap, data, imageSize);
-
-      ctx->Driver.UnmapTextureImage(ctx, texImage, 0);
-   }
-   else {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
+   _mesa_store_compressed_texsubimage2d(ctx, target, level,
+					0, 0,
+					width, height,
+					texImage->TexFormat,
+					imageSize, data,
+					texObj, texImage);
 }
 
 
@@ -5133,8 +5116,8 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,
    _mesa_get_format_block_size(texFormat, &bw, &bh);
 
    /* these should have been caught sooner */
-   ASSERT((width % bw) == 0 || width == 2 || width == 1);
-   ASSERT((height % bh) == 0 || height == 2 || height == 1);
+   ASSERT((width % bw) == 0 || width < bw);
+   ASSERT((height % bh) == 0 || height < bh);
    ASSERT((xoffset % bw) == 0);
    ASSERT((yoffset % bh) == 0);
 
@@ -5148,7 +5131,7 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,
    srcRowStride = _mesa_format_row_stride(texFormat, width);
    src = (const GLubyte *) data;
 
-   /* Map dest texture buffer (write to whole region) */
+   /* Map dest texture buffer */
    ctx->Driver.MapTextureImage(ctx, texImage, 0,
                                xoffset, yoffset, width, height,
                                GL_MAP_WRITE_BIT,
@@ -5156,7 +5139,7 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,
 
    if (dstMap) {
       bytesPerRow = srcRowStride;  /* bytes per row of blocks */
-      rows = height / bh;  /* rows in blocks */
+      rows = (height + bh - 1) / bh;  /* rows in blocks */
 
       /* copy rows of blocks */
       for (i = 0; i < rows; i++) {
diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c
index b5fb98ecb..11abd037d 100644
--- a/mesalib/src/mesa/main/transformfeedback.c
+++ b/mesalib/src/mesa/main/transformfeedback.c
@@ -614,7 +614,7 @@ _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
 
    if (count < 0 ||
        (bufferMode == GL_SEPARATE_ATTRIBS &&
-        count > ctx->Const.MaxTransformFeedbackSeparateAttribs)) {
+        (GLuint) count > ctx->Const.MaxTransformFeedbackSeparateAttribs)) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "glTransformFeedbackVaryings(count=%d)", count);
       return;
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index cfb0aa2a0..540e8963c 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -195,7 +195,7 @@ update_array(struct gl_context *ctx,
    }
 
    if (ctx->Array.ArrayObj->VBOonly &&
-       ctx->Array.ArrayBufferObj->Name == 0) {
+       !_mesa_is_bufferobj(ctx->Array.ArrayBufferObj)) {
       /* GL_ARB_vertex_array_object requires that all arrays reside in VBOs.
        * Generate GL_INVALID_OPERATION if that's not true.
        */
diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c
index dfccc60f6..e9bf3aadf 100644
--- a/mesalib/src/mesa/program/prog_print.c
+++ b/mesalib/src/mesa/program/prog_print.c
@@ -157,11 +157,11 @@ arb_input_attrib_string(GLint index, GLenum progType)
    assert(strcmp(vertAttribs[VERT_ATTRIB_GENERIC15], "vertex.attrib[15]") == 0);
 
    if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertAttribs) / sizeof(vertAttribs[0]));
+      assert(index < Elements(vertAttribs));
       return vertAttribs[index];
    }
    else {
-      assert(index < sizeof(fragAttribs) / sizeof(fragAttribs[0]));
+      assert(index < Elements(fragAttribs));
       return fragAttribs[index];
    }
 }
@@ -246,11 +246,11 @@ arb_output_attrib_string(GLint index, GLenum progType)
    };
 
    if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertResults) / sizeof(vertResults[0]));
+      assert(index < Elements(vertResults));
       return vertResults[index];
    }
    else {
-      assert(index < sizeof(fragResults) / sizeof(fragResults[0]));
+      assert(index < Elements(fragResults));
       return fragResults[index];
    }
 }
@@ -925,8 +925,8 @@ _mesa_fprint_program_parameters(FILE *f,
 {
    GLuint i;
 
-   fprintf(f, "InputsRead: 0x%x (0b%s)\n",
-                 prog->InputsRead, binary(prog->InputsRead));
+   fprintf(f, "InputsRead: 0x%llx (0b%s)\n",
+           (unsigned long long) prog->InputsRead, binary(prog->InputsRead));
    fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
                  (unsigned long long)prog->OutputsWritten, 
 		 binary(prog->OutputsWritten));
diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y
index 9fdb99db3..4f958a993 100644
--- a/mesalib/src/mesa/program/program_parse.y
+++ b/mesalib/src/mesa/program/program_parse.y
@@ -1110,7 +1110,7 @@ ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding
 	      YYERROR;
 	   } else {
 	      s->attrib_binding = $4;
-	      state->InputsBound |= (1U << s->attrib_binding);
+	      state->InputsBound |= BITFIELD64_BIT(s->attrib_binding);
 
 	      if (!validate_inputs(& @4, state)) {
 		 YYERROR;
@@ -2403,9 +2403,9 @@ set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,
 int
 validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)
 {
-   const int inputs = state->prog->InputsRead | state->InputsBound;
+   const GLbitfield64 inputs = state->prog->InputsRead | state->InputsBound;
 
-   if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {
+   if (((inputs & VERT_BIT_FF_ALL) & (inputs >> VERT_ATTRIB_GENERIC0)) != 0) {
       yyerror(locp, state, "illegal use of generic attribute and name attribute");
       return 0;
    }
diff --git a/mesalib/src/mesa/program/program_parser.h b/mesalib/src/mesa/program/program_parser.h
index 5637598f3..bc756148a 100644
--- a/mesalib/src/mesa/program/program_parser.h
+++ b/mesalib/src/mesa/program/program_parser.h
@@ -191,7 +191,7 @@ struct asm_parser_state {
     * multiple ATTRIB statements bind illegal combinations of vertex
     * attributes.
     */
-   unsigned InputsBound;
+   GLbitfield64 InputsBound;
 
    enum {
       invalid_mode = 0,
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index e72a1ce1e..1f109fb36 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -83,6 +83,7 @@ MAIN_SOURCES = \
 	main/texcompress_rgtc.c \
 	main/texcompress_s3tc.c \
 	main/texcompress_fxt1.c \
+	main/texcompress_etc.c \
 	main/texenv.c \
 	main/texformat.c \
 	main/texgen.c \
diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
index bbf2ef67e..a7e6a0f1b 100644
--- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c
+++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
@@ -1,288 +1,287 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, 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 TUNGSTEN GRAPHICS 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.

- * 

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

-

-#include "main/imports.h"

-#include "main/image.h"

-#include "main/macros.h"

-#include "main/mfeatures.h"

-

-#include "vbo/vbo.h"

-

-#include "st_context.h"

-#include "st_atom.h"

-#include "st_cb_bufferobjects.h"

-#include "st_draw.h"

-#include "st_program.h"

-

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "util/u_inlines.h"

-

-#include "draw/draw_private.h"

-#include "draw/draw_context.h"

-

-

-#if FEATURE_feedback || FEATURE_rastpos

-

-/**

- * Set the (private) draw module's post-transformed vertex format when in

- * GL_SELECT or GL_FEEDBACK mode or for glRasterPos.

- */

-static void

-set_feedback_vertex_format(struct gl_context *ctx)

-{

-#if 0

-   struct st_context *st = st_context(ctx);

-   struct vertex_info vinfo;

-   GLuint i;

-

-   memset(&vinfo, 0, sizeof(vinfo));

-

-   if (ctx->RenderMode == GL_SELECT) {

-      assert(ctx->RenderMode == GL_SELECT);

-      vinfo.num_attribs = 1;

-      vinfo.format[0] = FORMAT_4F;

-      vinfo.interp_mode[0] = INTERP_LINEAR;

-   }

-   else {

-      /* GL_FEEDBACK, or glRasterPos */

-      /* emit all attribs (pos, color, texcoord) as GLfloat[4] */

-      vinfo.num_attribs = st->state.vs->cso->state.num_outputs;

-      for (i = 0; i < vinfo.num_attribs; i++) {

-         vinfo.format[i] = FORMAT_4F;

-         vinfo.interp_mode[i] = INTERP_LINEAR;

-      }

-   }

-

-   draw_set_vertex_info(st->draw, &vinfo);

-#endif

-}

-

-

-/**

- * Called by VBO to draw arrays when in selection or feedback mode and

- * to implement glRasterPos.

- * This is very much like the normal draw_vbo() function above.

- * Look at code refactoring some day.

- * Might move this into the failover module some day.

- */

-void

-st_feedback_draw_vbo(struct gl_context *ctx,

-                     const struct gl_client_array **arrays,

-                     const struct _mesa_prim *prims,

-                     GLuint nr_prims,

-                     const struct _mesa_index_buffer *ib,

-		     GLboolean index_bounds_valid,

-                     GLuint min_index,

-                     GLuint max_index)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct draw_context *draw = st->draw;

-   const struct st_vertex_program *vp;

-   const struct pipe_shader_state *vs;

-   struct pipe_vertex_buffer vbuffers[PIPE_MAX_SHADER_INPUTS];

-   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];

-   struct pipe_index_buffer ibuffer;

-   struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];

-   struct pipe_transfer *ib_transfer = NULL;

-   GLuint attr, i;

-   const GLubyte *low_addr = NULL;

-   const void *mapped_indices = NULL;

-

-   assert(draw);

-

-   st_validate_state(st);

-

-   if (!index_bounds_valid)

-      vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);

-

-   /* must get these after state validation! */

-   vp = st->vp;

-   vs = &st->vp_variant->tgsi;

-

-   if (!st->vp_variant->draw_shader) {

-      st->vp_variant->draw_shader = draw_create_vertex_shader(draw, vs);

-   }

-

-   /*

-    * Set up the draw module's state.

-    *

-    * We'd like to do this less frequently, but the normal state-update

-    * code sends state updates to the pipe, not to our private draw module.

-    */

-   assert(draw);

-   draw_set_viewport_state(draw, &st->state.viewport);

-   draw_set_clip_state(draw, &st->state.clip);

-   draw_set_rasterizer_state(draw, &st->state.rasterizer, NULL);

-   draw_bind_vertex_shader(draw, st->vp_variant->draw_shader);

-   set_feedback_vertex_format(ctx);

-

-   /* Find the lowest address of the arrays we're drawing */

-   if (vp->num_inputs) {

-      low_addr = arrays[vp->index_to_input[0]]->Ptr;

-

-      for (attr = 1; attr < vp->num_inputs; attr++) {

-         const GLubyte *start = arrays[vp->index_to_input[attr]]->Ptr;

-         low_addr = MIN2(low_addr, start);

-      }

-   }

-

-   /* loop over TGSI shader inputs to determine vertex buffer

-    * and attribute info

-    */

-   for (attr = 0; attr < vp->num_inputs; attr++) {

-      const GLuint mesaAttr = vp->index_to_input[attr];

-      struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;

-      void *map;

-

-      if (bufobj && bufobj->Name) {

-         /* Attribute data is in a VBO.

-          * Recall that for VBOs, the gl_client_array->Ptr field is

-          * really an offset from the start of the VBO, not a pointer.

-          */

-         struct st_buffer_object *stobj = st_buffer_object(bufobj);

-         assert(stobj->buffer);

-

-         vbuffers[attr].buffer = NULL;

-         pipe_resource_reference(&vbuffers[attr].buffer, stobj->buffer);

-         vbuffers[attr].buffer_offset = pointer_to_offset(low_addr);

-         velements[attr].src_offset = arrays[mesaAttr]->Ptr - low_addr;

-      }

-      else {

-         /* attribute data is in user-space memory, not a VBO */

-         uint bytes = (arrays[mesaAttr]->Size

-                       * _mesa_sizeof_type(arrays[mesaAttr]->Type)

-                       * (max_index + 1));

-

-         /* wrap user data */

-         vbuffers[attr].buffer

-            = pipe_user_buffer_create(pipe->screen, (void *) arrays[mesaAttr]->Ptr,

-                                      bytes,

-				      PIPE_BIND_VERTEX_BUFFER);

-         vbuffers[attr].buffer_offset = 0;

-         velements[attr].src_offset = 0;

-      }

-

-      /* common-case setup */

-      vbuffers[attr].stride = arrays[mesaAttr]->StrideB; /* in bytes */

-      velements[attr].instance_divisor = 0;

-      velements[attr].vertex_buffer_index = attr;

-      velements[attr].src_format = 

-         st_pipe_vertex_format(arrays[mesaAttr]->Type,

-                               arrays[mesaAttr]->Size,

-                               arrays[mesaAttr]->Format,

-                               arrays[mesaAttr]->Normalized);

-      assert(velements[attr].src_format);

-

-      /* tell draw about this attribute */

-#if 0

-      draw_set_vertex_buffer(draw, attr, &vbuffer[attr]);

-#endif

-

-      /* map the attrib buffer */

-      map = pipe_buffer_map(pipe, vbuffers[attr].buffer,

-                            PIPE_TRANSFER_READ,

-			    &vb_transfer[attr]);

-      draw_set_mapped_vertex_buffer(draw, attr, map);

-   }

-

-   draw_set_vertex_buffers(draw, vp->num_inputs, vbuffers);

-   draw_set_vertex_elements(draw, vp->num_inputs, velements);

-

-   memset(&ibuffer, 0, sizeof(ibuffer));

-   if (ib) {

-      struct gl_buffer_object *bufobj = ib->obj;

-

-      switch (ib->type) {

-      case GL_UNSIGNED_INT:

-         ibuffer.index_size = 4;

-         break;

-      case GL_UNSIGNED_SHORT:

-         ibuffer.index_size = 2;

-         break;

-      case GL_UNSIGNED_BYTE:

-         ibuffer.index_size = 1;

-         break;

-      default:

-         assert(0);

-	 goto out_unref_vertex;

-      }

-

-      if (bufobj && bufobj->Name) {

-         struct st_buffer_object *stobj = st_buffer_object(bufobj);

-

-         pipe_resource_reference(&ibuffer.buffer, stobj->buffer);

-         ibuffer.offset = pointer_to_offset(ib->ptr);

-

-         mapped_indices = pipe_buffer_map(pipe, stobj->buffer,

-                                          PIPE_TRANSFER_READ, &ib_transfer);

-      }

-      else {

-         /* skip setting ibuffer.buffer as the draw module does not use it */

-         mapped_indices = ib->ptr;

-      }

-

-      draw_set_index_buffer(draw, &ibuffer);

-      draw_set_mapped_index_buffer(draw, mapped_indices);

-   }

-

-   /* set the constant buffer */

-   draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0,

-                                   st->state.constants[PIPE_SHADER_VERTEX].ptr,

-                                   st->state.constants[PIPE_SHADER_VERTEX].size);

-

-

-   /* draw here */

-   for (i = 0; i < nr_prims; i++) {

-      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);

-   }

-

-

-   /*

-    * unmap vertex/index buffers

-    */

-   if (ib) {

-      draw_set_mapped_index_buffer(draw, NULL);

-      draw_set_index_buffer(draw, NULL);

-

-      if (ib_transfer)

-         pipe_buffer_unmap(pipe, ib_transfer);

-      pipe_resource_reference(&ibuffer.buffer, NULL);

-   }

-

- out_unref_vertex:

-   for (attr = 0; attr < vp->num_inputs; attr++) {

-      pipe_buffer_unmap(pipe, vb_transfer[attr]);

-      draw_set_mapped_vertex_buffer(draw, attr, NULL);

-      pipe_resource_reference(&vbuffers[attr].buffer, NULL);

-   }

-   draw_set_vertex_buffers(draw, 0, NULL);

-}

-

-#endif /* FEATURE_feedback || FEATURE_rastpos */

-

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, 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 TUNGSTEN GRAPHICS 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.
+ * 
+ **************************************************************************/
+
+#include "main/imports.h"
+#include "main/image.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+
+#include "vbo/vbo.h"
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "st_cb_bufferobjects.h"
+#include "st_draw.h"
+#include "st_program.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "util/u_inlines.h"
+
+#include "draw/draw_private.h"
+#include "draw/draw_context.h"
+
+
+#if FEATURE_feedback || FEATURE_rastpos
+
+/**
+ * Set the (private) draw module's post-transformed vertex format when in
+ * GL_SELECT or GL_FEEDBACK mode or for glRasterPos.
+ */
+static void
+set_feedback_vertex_format(struct gl_context *ctx)
+{
+#if 0
+   struct st_context *st = st_context(ctx);
+   struct vertex_info vinfo;
+   GLuint i;
+
+   memset(&vinfo, 0, sizeof(vinfo));
+
+   if (ctx->RenderMode == GL_SELECT) {
+      assert(ctx->RenderMode == GL_SELECT);
+      vinfo.num_attribs = 1;
+      vinfo.format[0] = FORMAT_4F;
+      vinfo.interp_mode[0] = INTERP_LINEAR;
+   }
+   else {
+      /* GL_FEEDBACK, or glRasterPos */
+      /* emit all attribs (pos, color, texcoord) as GLfloat[4] */
+      vinfo.num_attribs = st->state.vs->cso->state.num_outputs;
+      for (i = 0; i < vinfo.num_attribs; i++) {
+         vinfo.format[i] = FORMAT_4F;
+         vinfo.interp_mode[i] = INTERP_LINEAR;
+      }
+   }
+
+   draw_set_vertex_info(st->draw, &vinfo);
+#endif
+}
+
+
+/**
+ * Called by VBO to draw arrays when in selection or feedback mode and
+ * to implement glRasterPos.
+ * This is very much like the normal draw_vbo() function above.
+ * Look at code refactoring some day.
+ */
+void
+st_feedback_draw_vbo(struct gl_context *ctx,
+                     const struct gl_client_array **arrays,
+                     const struct _mesa_prim *prims,
+                     GLuint nr_prims,
+                     const struct _mesa_index_buffer *ib,
+		     GLboolean index_bounds_valid,
+                     GLuint min_index,
+                     GLuint max_index)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct draw_context *draw = st->draw;
+   const struct st_vertex_program *vp;
+   const struct pipe_shader_state *vs;
+   struct pipe_vertex_buffer vbuffers[PIPE_MAX_SHADER_INPUTS];
+   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
+   struct pipe_index_buffer ibuffer;
+   struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];
+   struct pipe_transfer *ib_transfer = NULL;
+   GLuint attr, i;
+   const GLubyte *low_addr = NULL;
+   const void *mapped_indices = NULL;
+
+   assert(draw);
+
+   st_validate_state(st);
+
+   if (!index_bounds_valid)
+      vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);
+
+   /* must get these after state validation! */
+   vp = st->vp;
+   vs = &st->vp_variant->tgsi;
+
+   if (!st->vp_variant->draw_shader) {
+      st->vp_variant->draw_shader = draw_create_vertex_shader(draw, vs);
+   }
+
+   /*
+    * Set up the draw module's state.
+    *
+    * We'd like to do this less frequently, but the normal state-update
+    * code sends state updates to the pipe, not to our private draw module.
+    */
+   assert(draw);
+   draw_set_viewport_state(draw, &st->state.viewport);
+   draw_set_clip_state(draw, &st->state.clip);
+   draw_set_rasterizer_state(draw, &st->state.rasterizer, NULL);
+   draw_bind_vertex_shader(draw, st->vp_variant->draw_shader);
+   set_feedback_vertex_format(ctx);
+
+   /* Find the lowest address of the arrays we're drawing */
+   if (vp->num_inputs) {
+      low_addr = arrays[vp->index_to_input[0]]->Ptr;
+
+      for (attr = 1; attr < vp->num_inputs; attr++) {
+         const GLubyte *start = arrays[vp->index_to_input[attr]]->Ptr;
+         low_addr = MIN2(low_addr, start);
+      }
+   }
+
+   /* loop over TGSI shader inputs to determine vertex buffer
+    * and attribute info
+    */
+   for (attr = 0; attr < vp->num_inputs; attr++) {
+      const GLuint mesaAttr = vp->index_to_input[attr];
+      struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;
+      void *map;
+
+      if (bufobj && bufobj->Name) {
+         /* Attribute data is in a VBO.
+          * Recall that for VBOs, the gl_client_array->Ptr field is
+          * really an offset from the start of the VBO, not a pointer.
+          */
+         struct st_buffer_object *stobj = st_buffer_object(bufobj);
+         assert(stobj->buffer);
+
+         vbuffers[attr].buffer = NULL;
+         pipe_resource_reference(&vbuffers[attr].buffer, stobj->buffer);
+         vbuffers[attr].buffer_offset = pointer_to_offset(low_addr);
+         velements[attr].src_offset = arrays[mesaAttr]->Ptr - low_addr;
+      }
+      else {
+         /* attribute data is in user-space memory, not a VBO */
+         uint bytes = (arrays[mesaAttr]->Size
+                       * _mesa_sizeof_type(arrays[mesaAttr]->Type)
+                       * (max_index + 1));
+
+         /* wrap user data */
+         vbuffers[attr].buffer
+            = pipe_user_buffer_create(pipe->screen, (void *) arrays[mesaAttr]->Ptr,
+                                      bytes,
+				      PIPE_BIND_VERTEX_BUFFER);
+         vbuffers[attr].buffer_offset = 0;
+         velements[attr].src_offset = 0;
+      }
+
+      /* common-case setup */
+      vbuffers[attr].stride = arrays[mesaAttr]->StrideB; /* in bytes */
+      velements[attr].instance_divisor = 0;
+      velements[attr].vertex_buffer_index = attr;
+      velements[attr].src_format = 
+         st_pipe_vertex_format(arrays[mesaAttr]->Type,
+                               arrays[mesaAttr]->Size,
+                               arrays[mesaAttr]->Format,
+                               arrays[mesaAttr]->Normalized);
+      assert(velements[attr].src_format);
+
+      /* tell draw about this attribute */
+#if 0
+      draw_set_vertex_buffer(draw, attr, &vbuffer[attr]);
+#endif
+
+      /* map the attrib buffer */
+      map = pipe_buffer_map(pipe, vbuffers[attr].buffer,
+                            PIPE_TRANSFER_READ,
+			    &vb_transfer[attr]);
+      draw_set_mapped_vertex_buffer(draw, attr, map);
+   }
+
+   draw_set_vertex_buffers(draw, vp->num_inputs, vbuffers);
+   draw_set_vertex_elements(draw, vp->num_inputs, velements);
+
+   memset(&ibuffer, 0, sizeof(ibuffer));
+   if (ib) {
+      struct gl_buffer_object *bufobj = ib->obj;
+
+      switch (ib->type) {
+      case GL_UNSIGNED_INT:
+         ibuffer.index_size = 4;
+         break;
+      case GL_UNSIGNED_SHORT:
+         ibuffer.index_size = 2;
+         break;
+      case GL_UNSIGNED_BYTE:
+         ibuffer.index_size = 1;
+         break;
+      default:
+         assert(0);
+	 goto out_unref_vertex;
+      }
+
+      if (bufobj && bufobj->Name) {
+         struct st_buffer_object *stobj = st_buffer_object(bufobj);
+
+         pipe_resource_reference(&ibuffer.buffer, stobj->buffer);
+         ibuffer.offset = pointer_to_offset(ib->ptr);
+
+         mapped_indices = pipe_buffer_map(pipe, stobj->buffer,
+                                          PIPE_TRANSFER_READ, &ib_transfer);
+      }
+      else {
+         /* skip setting ibuffer.buffer as the draw module does not use it */
+         mapped_indices = ib->ptr;
+      }
+
+      draw_set_index_buffer(draw, &ibuffer);
+      draw_set_mapped_index_buffer(draw, mapped_indices);
+   }
+
+   /* set the constant buffer */
+   draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0,
+                                   st->state.constants[PIPE_SHADER_VERTEX].ptr,
+                                   st->state.constants[PIPE_SHADER_VERTEX].size);
+
+
+   /* draw here */
+   for (i = 0; i < nr_prims; i++) {
+      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);
+   }
+
+
+   /*
+    * unmap vertex/index buffers
+    */
+   if (ib) {
+      draw_set_mapped_index_buffer(draw, NULL);
+      draw_set_index_buffer(draw, NULL);
+
+      if (ib_transfer)
+         pipe_buffer_unmap(pipe, ib_transfer);
+      pipe_resource_reference(&ibuffer.buffer, NULL);
+   }
+
+ out_unref_vertex:
+   for (attr = 0; attr < vp->num_inputs; attr++) {
+      pipe_buffer_unmap(pipe, vb_transfer[attr]);
+      draw_set_mapped_vertex_buffer(draw, attr, NULL);
+      pipe_resource_reference(&vbuffers[attr].buffer, NULL);
+   }
+   draw_set_vertex_buffers(draw, 0, NULL);
+}
+
+#endif /* FEATURE_feedback || FEATURE_rastpos */
+
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index c741d13f4..37fb3e7fd 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -360,7 +360,7 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
    }
    if (screen->get_param(screen, PIPE_CAP_TIMER_QUERY)) {
-     ctx->Extensions.EXT_timer_query = GL_TRUE;
+      ctx->Extensions.EXT_timer_query = GL_TRUE;
    }
 
    if (screen->get_param(screen, PIPE_CAP_TEXTURE_SHADOW_MAP)) {
@@ -475,6 +475,14 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
    }
 
+   if (ctx->API != API_OPENGL) {
+      if (screen->is_format_supported(screen, PIPE_FORMAT_ETC1_RGB8,
+                                      PIPE_TEXTURE_2D, 0,
+                                      PIPE_BIND_SAMPLER_VIEW)) {
+         ctx->Extensions.OES_compressed_ETC1_RGB8_texture = GL_TRUE;
+      }
+   }
+
    if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,
                                    PIPE_TEXTURE_2D, 0,
                                    PIPE_BIND_SAMPLER_VIEW)) {
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index bc414f442..5f9ae9129 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -287,7 +287,7 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
       return PIPE_FORMAT_R8_UNORM;
    case MESA_FORMAT_R16:
       return PIPE_FORMAT_R16_UNORM;
-   case MESA_FORMAT_RG88:
+   case MESA_FORMAT_GR88:
       return PIPE_FORMAT_R8G8_UNORM;
    case MESA_FORMAT_RG1616:
       return PIPE_FORMAT_R16G16_UNORM;
@@ -420,6 +420,9 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
    case MESA_FORMAT_SIGNED_LA_LATC2:
       return PIPE_FORMAT_LATC2_SNORM;
 
+   case MESA_FORMAT_ETC1_RGB8:
+      return PIPE_FORMAT_ETC1_RGB8;
+
    /* signed normalized formats */
    case MESA_FORMAT_SIGNED_R8:
       return PIPE_FORMAT_R8_SNORM;
@@ -616,7 +619,7 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_R16_UNORM:
       return MESA_FORMAT_R16;
    case PIPE_FORMAT_R8G8_UNORM:
-      return MESA_FORMAT_RG88;
+      return MESA_FORMAT_GR88;
    case PIPE_FORMAT_R16G16_UNORM:
       return MESA_FORMAT_RG1616;
 
@@ -745,6 +748,9 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_LATC2_SNORM:
       return MESA_FORMAT_SIGNED_LA_LATC2;
 
+   case PIPE_FORMAT_ETC1_RGB8:
+      return MESA_FORMAT_ETC1_RGB8;
+
    /* signed normalized formats */
    case PIPE_FORMAT_R8_SNORM:
       return MESA_FORMAT_SIGNED_R8;
@@ -1189,6 +1195,12 @@ static const struct format_mapping format_map[] = {
       { PIPE_FORMAT_LATC2_SNORM, 0 }
    },
 
+   /* ETC1 */
+   {
+      { GL_ETC1_RGB8_OES, 0 },
+      { PIPE_FORMAT_ETC1_RGB8, 0 }
+   },
+
    /* signed/unsigned integer formats.
     */
    {
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c
index bcd63b602..7cb6e68b1 100644
--- a/mesalib/src/mesa/swrast/s_texfetch.c
+++ b/mesalib/src/mesa/swrast/s_texfetch.c
@@ -39,6 +39,7 @@
 #include "main/texcompress_fxt1.h"
 #include "main/texcompress_s3tc.h"
 #include "main/texcompress_rgtc.h"
+#include "main/texcompress_etc.h"
 #include "main/teximage.h"
 #include "s_context.h"
 #include "s_texfetch.h"
@@ -361,6 +362,13 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_r8,
    },
    {
+      MESA_FORMAT_GR88,
+      fetch_texel_1d_f_gr88,
+      fetch_texel_2d_f_gr88,
+      fetch_texel_3d_f_gr88,
+      store_texel_gr88,
+   },
+   {
       MESA_FORMAT_RG88,
       fetch_texel_1d_f_rg88,
       fetch_texel_2d_f_rg88,
@@ -368,13 +376,6 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_rg88,
    },
    {
-      MESA_FORMAT_RG88_REV,
-      fetch_texel_1d_f_rg88_rev,
-      fetch_texel_2d_f_rg88_rev,
-      fetch_texel_3d_f_rg88_rev,
-      store_texel_rg88_rev,
-   },
-   {
       MESA_FORMAT_R16,
       fetch_texel_1d_f_r16,
       fetch_texel_2d_f_r16,
@@ -1178,6 +1179,13 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       NULL
    },
    {
+      MESA_FORMAT_ETC1_RGB8,
+      NULL,
+      _mesa_fetch_texel_2d_f_etc1_rgb8,
+      NULL,
+      NULL
+   },
+   {
       MESA_FORMAT_SIGNED_A8,
       fetch_texel_1d_signed_a8,
       fetch_texel_2d_signed_a8,
@@ -1282,7 +1290,8 @@ _mesa_get_texel_fetch_func(gl_format format, GLuint dims)
    }
 #endif
 
-   assert(Elements(texfetch_funcs) == MESA_FORMAT_COUNT);
+   STATIC_ASSERT(Elements(texfetch_funcs) == MESA_FORMAT_COUNT);
+
    assert(format < MESA_FORMAT_COUNT);
 
    switch (dims) {
diff --git a/mesalib/src/mesa/swrast/s_texfetch_tmp.h b/mesalib/src/mesa/swrast/s_texfetch_tmp.h
index 4ee05a5ea..e9512b561 100644
--- a/mesalib/src/mesa/swrast/s_texfetch_tmp.h
+++ b/mesalib/src/mesa/swrast/s_texfetch_tmp.h
@@ -1007,10 +1007,10 @@ static void store_texel_argb2101010(struct swrast_texture_image *texImage,
 #endif
 
 
-/* MESA_FORMAT_RG88 **********************************************************/
+/* MESA_FORMAT_GR88 **********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */
-static void FETCH(f_rg88)( const struct swrast_texture_image *texImage,
+static void FETCH(f_gr88)( const struct swrast_texture_image *texImage,
                            GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
@@ -1021,7 +1021,7 @@ static void FETCH(f_rg88)( const struct swrast_texture_image *texImage,
 }
 
 #if DIM == 3
-static void store_texel_rg88(struct swrast_texture_image *texImage,
+static void store_texel_gr88(struct swrast_texture_image *texImage,
                              GLint i, GLint j, GLint k, const void *texel)
 {
    const GLchan *rgba = (const GLchan *) texel;
@@ -1033,26 +1033,26 @@ static void store_texel_rg88(struct swrast_texture_image *texImage,
 #endif
 
 
-/* MESA_FORMAT_RG88_REV ******************************************************/
+/* MESA_FORMAT_RG88 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D rg88_rev texture, return 4 GLchans */
-static void FETCH(f_rg88_rev)( const struct swrast_texture_image *texImage,
+static void FETCH(f_rg88)( const struct swrast_texture_image *texImage,
                            GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );
+   texel[RCOMP] = UBYTE_TO_FLOAT( s >> 8 );
+   texel[GCOMP] = UBYTE_TO_FLOAT( s & 0xff );
    texel[BCOMP] = 0.0;
    texel[ACOMP] = 1.0;
 }
 
 #if DIM == 3
-static void store_texel_rg88_rev(struct swrast_texture_image *texImage,
+static void store_texel_rg88(struct swrast_texture_image *texImage,
                              GLint i, GLint j, GLint k, const void *texel)
 {
    const GLubyte *rgba = (const GLubyte *) texel;
    GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_88(rgba[GCOMP], rgba[RCOMP]);
+   *dst = PACK_COLOR_88(rgba[RCOMP], rgba[GCOMP]);
 }
 #endif
 
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c
index 566262557..fb172f3a8 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.c
+++ b/mesalib/src/mesa/swrast/s_texfilter.c
@@ -273,6 +273,7 @@ linear_texel_locations(GLenum wrapMode,
    default:
       _mesa_problem(NULL, "Bad wrap mode");
       u = 0.0F;
+      break;
    }
    *weight = FRAC(u);
 }
@@ -471,6 +472,7 @@ clamp_rect_coord_linear(GLenum wrapMode, GLfloat coord, GLint max,
       _mesa_problem(NULL, "bad wrapMode in clamp_rect_coord_linear");
       i0 = i1 = 0;
       fcol = 0.0F;
+      break;
    }
    *i0out = i0;
    *i1out = i1;
@@ -533,6 +535,7 @@ nearest_texcoord(const struct gl_texture_object *texObj,
       break;
    default:
       *i = *j = *k = 0;
+      break;
    }
 }
 
@@ -589,6 +592,7 @@ linear_texcoord(const struct gl_texture_object *texObj,
 
    default:
       *slice = 0;
+      break;
    }
 }
 
@@ -787,6 +791,7 @@ get_border_color(const struct gl_texture_object *tObj,
       break;
    default:
       COPY_4V(rgba, tObj->Sampler.BorderColor.f);
+      break;
    }
 }
 
@@ -1537,6 +1542,7 @@ sample_lambda_2d(struct gl_context *ctx,
          break;
       default:
          _mesa_problem(ctx, "Bad mag filter in sample_lambda_2d");
+         break;
       }
    }
 }
@@ -2528,6 +2534,7 @@ sample_lambda_cube(struct gl_context *ctx,
          break;
       default:
          _mesa_problem(ctx, "Bad min filter in sample_lambda_cube");
+         break;
       }
    }
 
@@ -2545,6 +2552,7 @@ sample_lambda_cube(struct gl_context *ctx,
          break;
       default:
          _mesa_problem(ctx, "Bad mag filter in sample_lambda_cube");
+         break;
       }
    }
 }
@@ -3473,6 +3481,7 @@ sample_depth_texture( struct gl_context *ctx,
             break;
          default:
             _mesa_problem(ctx, "Bad depth texture mode");
+            break;
          }
       }
    }
diff --git a/mesalib/src/mesa/tnl/t_context.h b/mesalib/src/mesa/tnl/t_context.h
index 9fd5c99bb..36b104354 100644
--- a/mesalib/src/mesa/tnl/t_context.h
+++ b/mesalib/src/mesa/tnl/t_context.h
@@ -1,547 +1,546 @@
-/*

- * mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- *

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

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

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

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

- */

-

-/**

- * \file t_context.h

- * \brief TnL module datatypes and definitions.

- * \author Keith Whitwell

- */

-

-

-/**

- * \mainpage The TNL-module

- *

- * TNL stands for "transform and lighting", i.e. this module implements

- * a pipeline that receives as input a buffer of vertices and does all

- * necessary transformations (rotations, clipping, vertex shader etc.)

- * and passes then the output to the rasterizer.

- *

- * The tnl_pipeline contains the array of all stages, which should be

- * applied. Each stage is a black-box, which is described by an

- * tnl_pipeline_stage. The function ::_tnl_run_pipeline applies all the

- * stages to the vertex_buffer TNLcontext::vb, where the vertex data

- * is stored. The last stage in the pipeline is the rasterizer.

- *

- */

-

-

-#ifndef _T_CONTEXT_H

-#define _T_CONTEXT_H

-

-#include "main/glheader.h"

-#include "main/bitset.h"

-#include "main/mtypes.h"

-

-#include "math/m_vector.h"

-

-#include "vbo/vbo.h"

-

-#define MAX_PIPELINE_STAGES     30

-

-/*

- * Note: The first attributes match the VERT_ATTRIB_* definitions

- * in mtypes.h.  However, the tnl module has additional attributes

- * for materials, color indexes, edge flags, etc.

- */

-/* Although it's nice to use these as bit indexes in a DWORD flag, we

- * could manage without if necessary.  Another limit currently is the

- * number of bits allocated for these numbers in places like vertex

- * program instruction formats and register layouts.

- */

-/* The bit space exhaustion is a fact now, done by _TNL_ATTRIB_ATTRIBUTE* for

- * GLSL vertex shader which cannot be aliased with conventional vertex attribs.

- * Compacting _TNL_ATTRIB_MAT_* attribs would not work, they would not give

- * as many free bits (11 plus already 1 free bit) as _TNL_ATTRIB_ATTRIBUTE*

- * attribs want (16).

- */

-enum {

-	_TNL_ATTRIB_POS = 0,

-	_TNL_ATTRIB_WEIGHT = 1,

-	_TNL_ATTRIB_NORMAL = 2,

-	_TNL_ATTRIB_COLOR0 = 3,

-	_TNL_ATTRIB_COLOR1 = 4,

-	_TNL_ATTRIB_FOG = 5,

-	_TNL_ATTRIB_COLOR_INDEX = 6,

-	_TNL_ATTRIB_EDGEFLAG = 7,

-	_TNL_ATTRIB_TEX0 = 8,

-	_TNL_ATTRIB_TEX1 = 9,

-	_TNL_ATTRIB_TEX2 = 10,

-	_TNL_ATTRIB_TEX3 = 11,

-	_TNL_ATTRIB_TEX4 = 12,

-	_TNL_ATTRIB_TEX5 = 13,

-	_TNL_ATTRIB_TEX6 = 14,

-	_TNL_ATTRIB_TEX7 = 15,

-

-	_TNL_ATTRIB_GENERIC0 = 16, /* doesn't really exist! */

-	_TNL_ATTRIB_GENERIC1 = 17,

-	_TNL_ATTRIB_GENERIC2 = 18,

-	_TNL_ATTRIB_GENERIC3 = 19,

-	_TNL_ATTRIB_GENERIC4 = 20,

-	_TNL_ATTRIB_GENERIC5 = 21,

-	_TNL_ATTRIB_GENERIC6 = 22,

-	_TNL_ATTRIB_GENERIC7 = 23,

-	_TNL_ATTRIB_GENERIC8 = 24,

-	_TNL_ATTRIB_GENERIC9 = 25,

-	_TNL_ATTRIB_GENERIC10 = 26,

-	_TNL_ATTRIB_GENERIC11 = 27,

-	_TNL_ATTRIB_GENERIC12 = 28,

-	_TNL_ATTRIB_GENERIC13 = 29,

-	_TNL_ATTRIB_GENERIC14 = 30,

-	_TNL_ATTRIB_GENERIC15 = 31,

-

-	/* These alias with the generics, but they are not active

-	 * concurrently, so it's not a problem.  The TNL module

-	 * doesn't have to do anything about this as this is how they

-	 * are passed into the _draw_prims callback.

-	 *

-	 * When we generate fixed-function replacement programs (in

-	 * t_vp_build.c currently), they refer to the appropriate

-	 * generic attribute in order to pick up per-vertex material

-	 * data.

-	 */

-	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 16,

-	_TNL_ATTRIB_MAT_BACK_AMBIENT = 17,

-	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 18,

-	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 19,

-	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 20,

-	_TNL_ATTRIB_MAT_BACK_SPECULAR = 21,

-	_TNL_ATTRIB_MAT_FRONT_EMISSION = 22,

-	_TNL_ATTRIB_MAT_BACK_EMISSION = 23,

-	_TNL_ATTRIB_MAT_FRONT_SHININESS = 24,

-	_TNL_ATTRIB_MAT_BACK_SHININESS = 25,

-	_TNL_ATTRIB_MAT_FRONT_INDEXES = 26,

-	_TNL_ATTRIB_MAT_BACK_INDEXES = 27,

-

-	/* This is really a VERT_RESULT, not an attrib.  Need to fix

-	 * tnl to understand the difference.

-	 */

-	_TNL_ATTRIB_POINTSIZE = 16,

-

-	_TNL_ATTRIB_MAX = 32

-} ;

-

-#define _TNL_ATTRIB_TEX(u)       (_TNL_ATTRIB_TEX0 + (u))

-#define _TNL_ATTRIB_GENERIC(n) (_TNL_ATTRIB_GENERIC0 + (n))

-

-/* special index used for handing invalid glVertexAttribute() indices */

-#define _TNL_ATTRIB_ERROR    (_TNL_ATTRIB_GENERIC15 + 1)

-

-/**

- * Handy attribute ranges:

- */

-#define _TNL_FIRST_PROG      _TNL_ATTRIB_WEIGHT

-#define _TNL_LAST_PROG       _TNL_ATTRIB_TEX7

-

-#define _TNL_FIRST_TEX       _TNL_ATTRIB_TEX0

-#define _TNL_LAST_TEX        _TNL_ATTRIB_TEX7

-

-#define _TNL_FIRST_GENERIC _TNL_ATTRIB_GENERIC0

-#define _TNL_LAST_GENERIC  _TNL_ATTRIB_GENERIC15

-

-#define _TNL_FIRST_MAT       _TNL_ATTRIB_MAT_FRONT_AMBIENT /* GENERIC0 */

-#define _TNL_LAST_MAT        _TNL_ATTRIB_MAT_BACK_INDEXES  /* GENERIC11 */

-

-/* Number of available generic attributes */

-#define _TNL_NUM_GENERIC 16

-

-/* Number of attributes used for evaluators */

-#define _TNL_NUM_EVAL 16

-

-

-#define PRIM_BEGIN     0x10

-#define PRIM_END       0x20

-#define PRIM_MODE_MASK 0x0f

-

-static INLINE GLuint _tnl_translate_prim( const struct _mesa_prim *prim )

-{

-   GLuint flag;

-   flag = prim->mode;

-   if (prim->begin) flag |= PRIM_BEGIN;

-   if (prim->end) flag |= PRIM_END;

-   return flag;

-}

-

-

-

-

-/**

- * Contains the current state of a running pipeline.

- */

-struct vertex_buffer

-{

-   GLuint Size;  /**< Max vertices per vertex buffer, constant */

-

-   /* Constant over the pipeline.

-    */

-   GLuint Count;  /**< Number of vertices currently in buffer */

-

-   /* Pointers to current data.  Most of the data is in AttribPtr -- all of

-    * it that is one of VERT_ATTRIB_X.  For things only produced by TNL,

-    * such as backface color or eye-space coordinates, they are stored

-    * here.

-    */

-   GLuint      *Elts;		                

-   GLvector4f  *EyePtr;		                /* _TNL_BIT_POS */

-   GLvector4f  *ClipPtr;	                /* _TNL_BIT_POS */

-   GLvector4f  *NdcPtr;                         /* _TNL_BIT_POS */

-   GLubyte     ClipOrMask;	                /* _TNL_BIT_POS */

-   GLubyte     ClipAndMask;	                /* _TNL_BIT_POS */

-   GLubyte     *ClipMask;		        /* _TNL_BIT_POS */

-   GLfloat     *NormalLengthPtr;	        /* _TNL_BIT_NORMAL */

-   GLboolean   *EdgeFlag;	                /* _TNL_BIT_EDGEFLAG */

-   GLvector4f  *BackfaceIndexPtr;

-   GLvector4f  *BackfaceColorPtr;

-   GLvector4f  *BackfaceSecondaryColorPtr;

-

-   const struct _mesa_prim  *Primitive;	              

-   GLuint      PrimitiveCount;	      

-

-   /* Inputs to the vertex program stage */

-   GLvector4f *AttribPtr[_TNL_ATTRIB_MAX];      /* GL_NV_vertex_program */

-};

-

-

-/**

- * Describes an individual operation on the pipeline.

- */

-struct tnl_pipeline_stage

-{

-   const char *name;

-

-   /* Private data for the pipeline stage:

-    */

-   void *privatePtr;

-

-   /* Allocate private data

-    */

-   GLboolean (*create)( struct gl_context *ctx, struct tnl_pipeline_stage * );

-

-   /* Free private data.

-    */

-   void (*destroy)( struct tnl_pipeline_stage * );

-

-   /* Called on any statechange or input array size change or

-    * input array change to/from zero stride.

-    */

-   void (*validate)( struct gl_context *ctx, struct tnl_pipeline_stage * );

-

-   /* Called from _tnl_run_pipeline().  The stage.changed_inputs value

-    * encodes all inputs to thee struct which have changed.  If

-    * non-zero, recompute all affected outputs of the stage, otherwise

-    * execute any 'sideeffects' of the stage.

-    *

-    * Return value: GL_TRUE - keep going

-    *               GL_FALSE - finished pipeline

-    */

-   GLboolean (*run)( struct gl_context *ctx, struct tnl_pipeline_stage * );

-};

-

-

-

-/** Contains the array of all pipeline stages.

- * The default values are defined at the end of t_pipeline.c 

- */

-struct tnl_pipeline {

-   

-   GLuint last_attrib_stride[_TNL_ATTRIB_MAX];

-   GLuint last_attrib_size[_TNL_ATTRIB_MAX];

-   GLuint input_changes;

-   GLuint new_state;

-

-   struct tnl_pipeline_stage stages[MAX_PIPELINE_STAGES+1];

-   GLuint nr_stages;

-};

-

-struct tnl_clipspace;

-struct tnl_clipspace_attr;

-

-typedef void (*tnl_extract_func)( const struct tnl_clipspace_attr *a, 

-				  GLfloat *out, 

-				  const GLubyte *v );

-

-typedef void (*tnl_insert_func)( const struct tnl_clipspace_attr *a, 

-				 GLubyte *v, 

-				 const GLfloat *in );

-

-typedef void (*tnl_emit_func)( struct gl_context *ctx, 

-			       GLuint count, 

-			       GLubyte *dest );

-

-

-/**

- * Describes how to convert/move a vertex attribute from a vertex array

- * to a vertex structure.

- */

-struct tnl_clipspace_attr

-{

-   GLuint attrib;          /* which vertex attrib (0=position, etc) */

-   GLuint format;

-   GLuint vertoffset;      /* position of the attrib in the vertex struct */

-   GLuint vertattrsize;    /* size of the attribute in bytes */

-   GLubyte *inputptr;

-   GLuint inputstride;

-   GLuint inputsize;

-   const tnl_insert_func *insert;

-   tnl_insert_func emit;

-   tnl_extract_func extract;

-   const GLfloat *vp;   /* NDC->Viewport mapping matrix */

-};

-

-

-

-

-typedef void (*tnl_points_func)( struct gl_context *ctx, GLuint first, GLuint last );

-typedef void (*tnl_line_func)( struct gl_context *ctx, GLuint v1, GLuint v2 );

-typedef void (*tnl_triangle_func)( struct gl_context *ctx,

-				   GLuint v1, GLuint v2, GLuint v3 );

-typedef void (*tnl_quad_func)( struct gl_context *ctx, GLuint v1, GLuint v2,

-			       GLuint v3, GLuint v4 );

-typedef void (*tnl_render_func)( struct gl_context *ctx, GLuint start, GLuint count,

-				 GLuint flags );

-typedef void (*tnl_interp_func)( struct gl_context *ctx,

-				 GLfloat t, GLuint dst, GLuint out, GLuint in,

-				 GLboolean force_boundary );

-typedef void (*tnl_copy_pv_func)( struct gl_context *ctx, GLuint dst, GLuint src );

-typedef void (*tnl_setup_func)( struct gl_context *ctx,

-				GLuint start, GLuint end,

-				GLuint new_inputs);

-

-

-struct tnl_attr_type {

-   GLuint format;

-   GLuint size;

-   GLuint stride;

-   GLuint offset;

-};

-

-struct tnl_clipspace_fastpath {

-   GLuint vertex_size;

-   GLuint attr_count;

-   GLboolean match_strides;

-

-   struct tnl_attr_type *attr;

-

-   tnl_emit_func func;

-   struct tnl_clipspace_fastpath *next;

-};

-

-/**

- * Used to describe conversion of vertex arrays to vertex structures.

- * I.e. Structure of arrays to arrays of structs.

- */

-struct tnl_clipspace

-{

-   GLboolean need_extras;

-   

-   GLuint new_inputs;

-

-   GLubyte *vertex_buf;

-   GLuint vertex_size;

-   GLuint max_vertex_size;

-

-   struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];

-   GLuint attr_count;

-

-   tnl_emit_func emit;

-   tnl_interp_func interp;

-   tnl_copy_pv_func copy_pv;

-

-   /* Parameters and constants for codegen:

-    */

-   GLboolean need_viewport;

-   GLfloat vp_scale[4];		

-   GLfloat vp_xlate[4];

-   GLfloat chan_scale[4];

-   GLfloat identity[4];

-

-   struct tnl_clipspace_fastpath *fastpath;

-   

-   void (*codegen_emit)( struct gl_context *ctx );

-};

-

-

-struct tnl_device_driver

-{

-   /***

-    *** TNL Pipeline

-    ***/

-

-   void (*RunPipeline)(struct gl_context *ctx);

-   /* Replaces PipelineStart/PipelineFinish -- intended to allow

-    * drivers to wrap _tnl_run_pipeline() with code to validate state

-    * and grab/release hardware locks.  

-    */

-

-   void (*NotifyMaterialChange)(struct gl_context *ctx);

-   /* Alert tnl-aware drivers of changes to material.

-    */

-

-   /***

-    *** Rendering -- These functions called only from t_vb_render.c

-    ***/

-   struct

-   {

-      void (*Start)(struct gl_context *ctx);

-      void (*Finish)(struct gl_context *ctx);

-      /* Called before and after all rendering operations, including DrawPixels,

-       * ReadPixels, Bitmap, span functions, and CopyTexImage, etc commands.

-       * These are a suitable place for grabbing/releasing hardware locks.

-       */

-

-      void (*PrimitiveNotify)(struct gl_context *ctx, GLenum mode);

-      /* Called between RenderStart() and RenderFinish() to indicate the

-       * type of primitive we're about to draw.  Mode will be one of the

-       * modes accepted by glBegin().

-       */

-

-      tnl_interp_func Interp;

-      /* The interp function is called by the clipping routines when we need

-       * to generate an interpolated vertex.  All pertinant vertex ancilliary

-       * data should be computed by interpolating between the 'in' and 'out'

-       * vertices.

-       */

-

-      tnl_copy_pv_func CopyPV;

-      /* The copy function is used to make a copy of a vertex.  All pertinant

-       * vertex attributes should be copied.

-       */

-

-      void (*ClippedPolygon)( struct gl_context *ctx, const GLuint *elts, GLuint n );

-      /* Render a polygon with <n> vertices whose indexes are in the <elts>

-       * array.

-       */

-

-      void (*ClippedLine)( struct gl_context *ctx, GLuint v0, GLuint v1 );

-      /* Render a line between the two vertices given by indexes v0 and v1. */

-

-      tnl_points_func           Points; /* must now respect vb->elts */

-      tnl_line_func             Line;

-      tnl_triangle_func         Triangle;

-      tnl_quad_func             Quad;

-      /* These functions are called in order to render points, lines,

-       * triangles and quads.  These are only called via the T&L module.

-       */

-

-      tnl_render_func          *PrimTabVerts;

-      tnl_render_func          *PrimTabElts;

-      /* Render whole unclipped primitives (points, lines, linestrips,

-       * lineloops, etc).  The tables are indexed by the GL enum of the

-       * primitive to be rendered.  RenderTabVerts is used for non-indexed

-       * arrays of vertices.  RenderTabElts is used for indexed arrays of

-       * vertices.

-       */

-

-      void (*ResetLineStipple)( struct gl_context *ctx );

-      /* Reset the hardware's line stipple counter.

-       */

-

-      tnl_setup_func BuildVertices;

-      /* This function is called whenever new vertices are required for

-       * rendering.  The vertices in question are those n such that start

-       * <= n < end.  The new_inputs parameter indicates those fields of

-       * the vertex which need to be updated, if only a partial repair of

-       * the vertex is required.

-       *

-       * This function is called only from _tnl_render_stage in tnl/t_render.c.

-       */

-      

-

-      GLboolean (*Multipass)( struct gl_context *ctx, GLuint passno );

-      /* Driver may request additional render passes by returning GL_TRUE

-       * when this function is called.  This function will be called

-       * after the first pass, and passes will be made until the function

-       * returns GL_FALSE.  If no function is registered, only one pass

-       * is made.

-       *

-       * This function will be first invoked with passno == 1.

-       */

-   } Render;

-};

-

-

-#define DECLARE_RENDERINPUTS(name) BITSET64_DECLARE(name, _TNL_ATTRIB_MAX)

-#define RENDERINPUTS_COPY BITSET64_COPY

-#define RENDERINPUTS_EQUAL BITSET64_EQUAL

-#define RENDERINPUTS_ZERO BITSET64_ZERO

-#define RENDERINPUTS_ONES BITSET64_ONES

-#define RENDERINPUTS_TEST BITSET64_TEST

-#define RENDERINPUTS_SET BITSET64_SET

-#define RENDERINPUTS_CLEAR BITSET64_CLEAR

-#define RENDERINPUTS_TEST_RANGE BITSET64_TEST_RANGE

-#define RENDERINPUTS_SET_RANGE BITSET64_SET_RANGE

-#define RENDERINPUTS_CLEAR_RANGE BITSET64_CLEAR_RANGE

-

-

-/**

- * Context state for T&L context.

- */

-typedef struct

-{

-   /* Driver interface.

-    */

-   struct tnl_device_driver Driver;

-

-   /* Pipeline

-    */

-   struct tnl_pipeline pipeline;

-   struct vertex_buffer vb;

-

-   /* Clipspace/ndc/window vertex managment:

-    */

-   struct tnl_clipspace clipspace;

-

-   /* Probably need a better configuration mechanism:

-    */

-   GLboolean NeedNdcCoords;

-   GLboolean AllowVertexFog;

-   GLboolean AllowPixelFog;

-   GLboolean _DoVertexFog;  /* eval fog function at each vertex? */

-

-   DECLARE_RENDERINPUTS(render_inputs_bitset);

-

-   GLvector4f tmp_inputs[VERT_ATTRIB_MAX];

-

-   /* Temp storage for t_draw.c: 

-    */

-   GLubyte *block[VERT_ATTRIB_MAX];

-   GLuint nr_blocks;

-

-   GLuint CurInstance;

-

-} TNLcontext;

-

-

-

-#define TNL_CONTEXT(ctx) ((TNLcontext *)((ctx)->swtnl_context))

-

-

-#define TYPE_IDX(t) ((t) & 0xf)

-#define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */

-

-

-extern void

-tnl_clip_prepare(struct gl_context *ctx);

-

-

-#endif

+/*
+ * mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file t_context.h
+ * \brief TnL module datatypes and definitions.
+ * \author Keith Whitwell
+ */
+
+
+/**
+ * \mainpage The TNL-module
+ *
+ * TNL stands for "transform and lighting", i.e. this module implements
+ * a pipeline that receives as input a buffer of vertices and does all
+ * necessary transformations (rotations, clipping, vertex shader etc.)
+ * and passes then the output to the rasterizer.
+ *
+ * The tnl_pipeline contains the array of all stages, which should be
+ * applied. Each stage is a black-box, which is described by an
+ * tnl_pipeline_stage. The function ::_tnl_run_pipeline applies all the
+ * stages to the vertex_buffer TNLcontext::vb, where the vertex data
+ * is stored. The last stage in the pipeline is the rasterizer.
+ *
+ */
+
+
+#ifndef _T_CONTEXT_H
+#define _T_CONTEXT_H
+
+#include "main/glheader.h"
+#include "main/bitset.h"
+#include "main/mtypes.h"
+
+#include "math/m_vector.h"
+
+#include "vbo/vbo.h"
+
+#define MAX_PIPELINE_STAGES     30
+
+/*
+ * Note: The first attributes match the VERT_ATTRIB_* definitions
+ * in mtypes.h.  However, the tnl module has additional attributes
+ * for materials, color indexes, edge flags, etc.
+ */
+/* Although it's nice to use these as bit indexes in a DWORD flag, we
+ * could manage without if necessary.  Another limit currently is the
+ * number of bits allocated for these numbers in places like vertex
+ * program instruction formats and register layouts.
+ */
+/* The bit space exhaustion is a fact now, done by _TNL_ATTRIB_ATTRIBUTE* for
+ * GLSL vertex shader which cannot be aliased with conventional vertex attribs.
+ * Compacting _TNL_ATTRIB_MAT_* attribs would not work, they would not give
+ * as many free bits (11 plus already 1 free bit) as _TNL_ATTRIB_ATTRIBUTE*
+ * attribs want (16).
+ */
+enum {
+	_TNL_ATTRIB_POS = 0,
+	_TNL_ATTRIB_WEIGHT = 1,
+	_TNL_ATTRIB_NORMAL = 2,
+	_TNL_ATTRIB_COLOR0 = 3,
+	_TNL_ATTRIB_COLOR1 = 4,
+	_TNL_ATTRIB_FOG = 5,
+	_TNL_ATTRIB_COLOR_INDEX = 6,
+	_TNL_ATTRIB_EDGEFLAG = 7,
+	_TNL_ATTRIB_TEX0 = 8,
+	_TNL_ATTRIB_TEX1 = 9,
+	_TNL_ATTRIB_TEX2 = 10,
+	_TNL_ATTRIB_TEX3 = 11,
+	_TNL_ATTRIB_TEX4 = 12,
+	_TNL_ATTRIB_TEX5 = 13,
+	_TNL_ATTRIB_TEX6 = 14,
+	_TNL_ATTRIB_TEX7 = 15,
+
+	_TNL_ATTRIB_GENERIC0 = 17, /* doesn't really exist! */
+	_TNL_ATTRIB_GENERIC1 = 18,
+	_TNL_ATTRIB_GENERIC2 = 19,
+	_TNL_ATTRIB_GENERIC3 = 20,
+	_TNL_ATTRIB_GENERIC4 = 21,
+	_TNL_ATTRIB_GENERIC5 = 22,
+	_TNL_ATTRIB_GENERIC6 = 23,
+	_TNL_ATTRIB_GENERIC7 = 24,
+	_TNL_ATTRIB_GENERIC8 = 25,
+	_TNL_ATTRIB_GENERIC9 = 26,
+	_TNL_ATTRIB_GENERIC10 = 27,
+	_TNL_ATTRIB_GENERIC11 = 28,
+	_TNL_ATTRIB_GENERIC12 = 29,
+	_TNL_ATTRIB_GENERIC13 = 30,
+	_TNL_ATTRIB_GENERIC14 = 31,
+	_TNL_ATTRIB_GENERIC15 = 32,
+
+	/* These alias with the generics, but they are not active
+	 * concurrently, so it's not a problem.  The TNL module
+	 * doesn't have to do anything about this as this is how they
+	 * are passed into the _draw_prims callback.
+	 *
+	 * When we generate fixed-function replacement programs (in
+	 * t_vp_build.c currently), they refer to the appropriate
+	 * generic attribute in order to pick up per-vertex material
+	 * data.
+	 */
+	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 17,
+	_TNL_ATTRIB_MAT_BACK_AMBIENT = 18,
+	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 19,
+	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 20,
+	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 21,
+	_TNL_ATTRIB_MAT_BACK_SPECULAR = 22,
+	_TNL_ATTRIB_MAT_FRONT_EMISSION = 23,
+	_TNL_ATTRIB_MAT_BACK_EMISSION = 24,
+	_TNL_ATTRIB_MAT_FRONT_SHININESS = 25,
+	_TNL_ATTRIB_MAT_BACK_SHININESS = 26,
+	_TNL_ATTRIB_MAT_FRONT_INDEXES = 27,
+	_TNL_ATTRIB_MAT_BACK_INDEXES = 28,
+
+	/* This is really a VERT_RESULT, not an attrib.  Need to fix
+	 * tnl to understand the difference.
+	 */
+	_TNL_ATTRIB_POINTSIZE = 16,
+
+	_TNL_ATTRIB_MAX = 33
+} ;
+
+#define _TNL_ATTRIB_TEX(u)       (_TNL_ATTRIB_TEX0 + (u))
+#define _TNL_ATTRIB_GENERIC(n) (_TNL_ATTRIB_GENERIC0 + (n))
+
+/* special index used for handing invalid glVertexAttribute() indices */
+#define _TNL_ATTRIB_ERROR    (_TNL_ATTRIB_GENERIC15 + 1)
+
+/**
+ * Handy attribute ranges:
+ */
+#define _TNL_FIRST_PROG      _TNL_ATTRIB_WEIGHT
+#define _TNL_LAST_PROG       _TNL_ATTRIB_TEX7
+
+#define _TNL_FIRST_TEX       _TNL_ATTRIB_TEX0
+#define _TNL_LAST_TEX        _TNL_ATTRIB_TEX7
+
+#define _TNL_FIRST_GENERIC _TNL_ATTRIB_GENERIC0
+#define _TNL_LAST_GENERIC  _TNL_ATTRIB_GENERIC15
+
+#define _TNL_FIRST_MAT       _TNL_ATTRIB_MAT_FRONT_AMBIENT /* GENERIC0 */
+#define _TNL_LAST_MAT        _TNL_ATTRIB_MAT_BACK_INDEXES  /* GENERIC11 */
+
+/* Number of available generic attributes */
+#define _TNL_NUM_GENERIC 16
+
+/* Number of attributes used for evaluators */
+#define _TNL_NUM_EVAL 16
+
+
+#define PRIM_BEGIN     0x10
+#define PRIM_END       0x20
+#define PRIM_MODE_MASK 0x0f
+
+static inline GLuint _tnl_translate_prim( const struct _mesa_prim *prim )
+{
+   GLuint flag;
+   flag = prim->mode;
+   if (prim->begin) flag |= PRIM_BEGIN;
+   if (prim->end) flag |= PRIM_END;
+   return flag;
+}
+
+
+
+
+/**
+ * Contains the current state of a running pipeline.
+ */
+struct vertex_buffer
+{
+   GLuint Size;  /**< Max vertices per vertex buffer, constant */
+
+   /* Constant over the pipeline.
+    */
+   GLuint Count;  /**< Number of vertices currently in buffer */
+
+   /* Pointers to current data.  Most of the data is in AttribPtr -- all of
+    * it that is one of VERT_ATTRIB_X.  For things only produced by TNL,
+    * such as backface color or eye-space coordinates, they are stored
+    * here.
+    */
+   GLuint      *Elts;		                
+   GLvector4f  *EyePtr;		                /* _TNL_BIT_POS */
+   GLvector4f  *ClipPtr;	                /* _TNL_BIT_POS */
+   GLvector4f  *NdcPtr;                         /* _TNL_BIT_POS */
+   GLubyte     ClipOrMask;	                /* _TNL_BIT_POS */
+   GLubyte     ClipAndMask;	                /* _TNL_BIT_POS */
+   GLubyte     *ClipMask;		        /* _TNL_BIT_POS */
+   GLfloat     *NormalLengthPtr;	        /* _TNL_BIT_NORMAL */
+   GLboolean   *EdgeFlag;	                /* _TNL_BIT_EDGEFLAG */
+   GLvector4f  *BackfaceIndexPtr;
+   GLvector4f  *BackfaceColorPtr;
+   GLvector4f  *BackfaceSecondaryColorPtr;
+
+   const struct _mesa_prim  *Primitive;	              
+   GLuint      PrimitiveCount;	      
+
+   /* Inputs to the vertex program stage */
+   GLvector4f *AttribPtr[_TNL_ATTRIB_MAX];      /* GL_NV_vertex_program */
+};
+
+
+/**
+ * Describes an individual operation on the pipeline.
+ */
+struct tnl_pipeline_stage
+{
+   const char *name;
+
+   /* Private data for the pipeline stage:
+    */
+   void *privatePtr;
+
+   /* Allocate private data
+    */
+   GLboolean (*create)( struct gl_context *ctx, struct tnl_pipeline_stage * );
+
+   /* Free private data.
+    */
+   void (*destroy)( struct tnl_pipeline_stage * );
+
+   /* Called on any statechange or input array size change or
+    * input array change to/from zero stride.
+    */
+   void (*validate)( struct gl_context *ctx, struct tnl_pipeline_stage * );
+
+   /* Called from _tnl_run_pipeline().  The stage.changed_inputs value
+    * encodes all inputs to thee struct which have changed.  If
+    * non-zero, recompute all affected outputs of the stage, otherwise
+    * execute any 'sideeffects' of the stage.
+    *
+    * Return value: GL_TRUE - keep going
+    *               GL_FALSE - finished pipeline
+    */
+   GLboolean (*run)( struct gl_context *ctx, struct tnl_pipeline_stage * );
+};
+
+
+
+/** Contains the array of all pipeline stages.
+ * The default values are defined at the end of t_pipeline.c 
+ */
+struct tnl_pipeline {
+   
+   GLuint last_attrib_stride[_TNL_ATTRIB_MAX];
+   GLuint last_attrib_size[_TNL_ATTRIB_MAX];
+   GLuint input_changes;
+   GLuint new_state;
+
+   struct tnl_pipeline_stage stages[MAX_PIPELINE_STAGES+1];
+   GLuint nr_stages;
+};
+
+struct tnl_clipspace;
+struct tnl_clipspace_attr;
+
+typedef void (*tnl_extract_func)( const struct tnl_clipspace_attr *a, 
+				  GLfloat *out, 
+				  const GLubyte *v );
+
+typedef void (*tnl_insert_func)( const struct tnl_clipspace_attr *a, 
+				 GLubyte *v, 
+				 const GLfloat *in );
+
+typedef void (*tnl_emit_func)( struct gl_context *ctx, 
+			       GLuint count, 
+			       GLubyte *dest );
+
+
+/**
+ * Describes how to convert/move a vertex attribute from a vertex array
+ * to a vertex structure.
+ */
+struct tnl_clipspace_attr
+{
+   GLuint attrib;          /* which vertex attrib (0=position, etc) */
+   GLuint format;
+   GLuint vertoffset;      /* position of the attrib in the vertex struct */
+   GLuint vertattrsize;    /* size of the attribute in bytes */
+   GLubyte *inputptr;
+   GLuint inputstride;
+   GLuint inputsize;
+   const tnl_insert_func *insert;
+   tnl_insert_func emit;
+   tnl_extract_func extract;
+   const GLfloat *vp;   /* NDC->Viewport mapping matrix */
+};
+
+
+
+
+typedef void (*tnl_points_func)( struct gl_context *ctx, GLuint first, GLuint last );
+typedef void (*tnl_line_func)( struct gl_context *ctx, GLuint v1, GLuint v2 );
+typedef void (*tnl_triangle_func)( struct gl_context *ctx,
+				   GLuint v1, GLuint v2, GLuint v3 );
+typedef void (*tnl_quad_func)( struct gl_context *ctx, GLuint v1, GLuint v2,
+			       GLuint v3, GLuint v4 );
+typedef void (*tnl_render_func)( struct gl_context *ctx, GLuint start, GLuint count,
+				 GLuint flags );
+typedef void (*tnl_interp_func)( struct gl_context *ctx,
+				 GLfloat t, GLuint dst, GLuint out, GLuint in,
+				 GLboolean force_boundary );
+typedef void (*tnl_copy_pv_func)( struct gl_context *ctx, GLuint dst, GLuint src );
+typedef void (*tnl_setup_func)( struct gl_context *ctx,
+				GLuint start, GLuint end,
+				GLuint new_inputs);
+
+
+struct tnl_attr_type {
+   GLuint format;
+   GLuint size;
+   GLuint stride;
+   GLuint offset;
+};
+
+struct tnl_clipspace_fastpath {
+   GLuint vertex_size;
+   GLuint attr_count;
+   GLboolean match_strides;
+
+   struct tnl_attr_type *attr;
+
+   tnl_emit_func func;
+   struct tnl_clipspace_fastpath *next;
+};
+
+/**
+ * Used to describe conversion of vertex arrays to vertex structures.
+ * I.e. Structure of arrays to arrays of structs.
+ */
+struct tnl_clipspace
+{
+   GLboolean need_extras;
+   
+   GLuint new_inputs;
+
+   GLubyte *vertex_buf;
+   GLuint vertex_size;
+   GLuint max_vertex_size;
+
+   struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];
+   GLuint attr_count;
+
+   tnl_emit_func emit;
+   tnl_interp_func interp;
+   tnl_copy_pv_func copy_pv;
+
+   /* Parameters and constants for codegen:
+    */
+   GLboolean need_viewport;
+   GLfloat vp_scale[4];		
+   GLfloat vp_xlate[4];
+   GLfloat chan_scale[4];
+   GLfloat identity[4];
+
+   struct tnl_clipspace_fastpath *fastpath;
+   
+   void (*codegen_emit)( struct gl_context *ctx );
+};
+
+
+struct tnl_device_driver
+{
+   /***
+    *** TNL Pipeline
+    ***/
+
+   void (*RunPipeline)(struct gl_context *ctx);
+   /* Replaces PipelineStart/PipelineFinish -- intended to allow
+    * drivers to wrap _tnl_run_pipeline() with code to validate state
+    * and grab/release hardware locks.  
+    */
+
+   void (*NotifyMaterialChange)(struct gl_context *ctx);
+   /* Alert tnl-aware drivers of changes to material.
+    */
+
+   /***
+    *** Rendering -- These functions called only from t_vb_render.c
+    ***/
+   struct
+   {
+      void (*Start)(struct gl_context *ctx);
+      void (*Finish)(struct gl_context *ctx);
+      /* Called before and after all rendering operations, including DrawPixels,
+       * ReadPixels, Bitmap, span functions, and CopyTexImage, etc commands.
+       * These are a suitable place for grabbing/releasing hardware locks.
+       */
+
+      void (*PrimitiveNotify)(struct gl_context *ctx, GLenum mode);
+      /* Called between RenderStart() and RenderFinish() to indicate the
+       * type of primitive we're about to draw.  Mode will be one of the
+       * modes accepted by glBegin().
+       */
+
+      tnl_interp_func Interp;
+      /* The interp function is called by the clipping routines when we need
+       * to generate an interpolated vertex.  All pertinant vertex ancilliary
+       * data should be computed by interpolating between the 'in' and 'out'
+       * vertices.
+       */
+
+      tnl_copy_pv_func CopyPV;
+      /* The copy function is used to make a copy of a vertex.  All pertinant
+       * vertex attributes should be copied.
+       */
+
+      void (*ClippedPolygon)( struct gl_context *ctx, const GLuint *elts, GLuint n );
+      /* Render a polygon with <n> vertices whose indexes are in the <elts>
+       * array.
+       */
+
+      void (*ClippedLine)( struct gl_context *ctx, GLuint v0, GLuint v1 );
+      /* Render a line between the two vertices given by indexes v0 and v1. */
+
+      tnl_points_func           Points; /* must now respect vb->elts */
+      tnl_line_func             Line;
+      tnl_triangle_func         Triangle;
+      tnl_quad_func             Quad;
+      /* These functions are called in order to render points, lines,
+       * triangles and quads.  These are only called via the T&L module.
+       */
+
+      tnl_render_func          *PrimTabVerts;
+      tnl_render_func          *PrimTabElts;
+      /* Render whole unclipped primitives (points, lines, linestrips,
+       * lineloops, etc).  The tables are indexed by the GL enum of the
+       * primitive to be rendered.  RenderTabVerts is used for non-indexed
+       * arrays of vertices.  RenderTabElts is used for indexed arrays of
+       * vertices.
+       */
+
+      void (*ResetLineStipple)( struct gl_context *ctx );
+      /* Reset the hardware's line stipple counter.
+       */
+
+      tnl_setup_func BuildVertices;
+      /* This function is called whenever new vertices are required for
+       * rendering.  The vertices in question are those n such that start
+       * <= n < end.  The new_inputs parameter indicates those fields of
+       * the vertex which need to be updated, if only a partial repair of
+       * the vertex is required.
+       *
+       * This function is called only from _tnl_render_stage in tnl/t_render.c.
+       */
+      
+
+      GLboolean (*Multipass)( struct gl_context *ctx, GLuint passno );
+      /* Driver may request additional render passes by returning GL_TRUE
+       * when this function is called.  This function will be called
+       * after the first pass, and passes will be made until the function
+       * returns GL_FALSE.  If no function is registered, only one pass
+       * is made.
+       *
+       * This function will be first invoked with passno == 1.
+       */
+   } Render;
+};
+
+
+#define DECLARE_RENDERINPUTS(name) BITSET64_DECLARE(name, _TNL_ATTRIB_MAX)
+#define RENDERINPUTS_COPY BITSET64_COPY
+#define RENDERINPUTS_EQUAL BITSET64_EQUAL
+#define RENDERINPUTS_ZERO BITSET64_ZERO
+#define RENDERINPUTS_ONES BITSET64_ONES
+#define RENDERINPUTS_TEST BITSET64_TEST
+#define RENDERINPUTS_SET BITSET64_SET
+#define RENDERINPUTS_CLEAR BITSET64_CLEAR
+#define RENDERINPUTS_TEST_RANGE BITSET64_TEST_RANGE
+#define RENDERINPUTS_SET_RANGE BITSET64_SET_RANGE
+#define RENDERINPUTS_CLEAR_RANGE BITSET64_CLEAR_RANGE
+
+
+/**
+ * Context state for T&L context.
+ */
+typedef struct
+{
+   /* Driver interface.
+    */
+   struct tnl_device_driver Driver;
+
+   /* Pipeline
+    */
+   struct tnl_pipeline pipeline;
+   struct vertex_buffer vb;
+
+   /* Clipspace/ndc/window vertex managment:
+    */
+   struct tnl_clipspace clipspace;
+
+   /* Probably need a better configuration mechanism:
+    */
+   GLboolean NeedNdcCoords;
+   GLboolean AllowVertexFog;
+   GLboolean AllowPixelFog;
+   GLboolean _DoVertexFog;  /* eval fog function at each vertex? */
+
+   DECLARE_RENDERINPUTS(render_inputs_bitset);
+
+   GLvector4f tmp_inputs[VERT_ATTRIB_MAX];
+
+   /* Temp storage for t_draw.c: 
+    */
+   GLubyte *block[VERT_ATTRIB_MAX];
+   GLuint nr_blocks;
+
+   GLuint CurInstance;
+} TNLcontext;
+
+
+
+#define TNL_CONTEXT(ctx) ((TNLcontext *)((ctx)->swtnl_context))
+
+
+#define TYPE_IDX(t) ((t) & 0xf)
+#define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */
+
+
+extern void
+tnl_clip_prepare(struct gl_context *ctx);
+
+
+#endif
diff --git a/mesalib/src/mesa/tnl/t_vb_cliptmp.h b/mesalib/src/mesa/tnl/t_vb_cliptmp.h
index b67aaddda..0b45bc534 100644
--- a/mesalib/src/mesa/tnl/t_vb_cliptmp.h
+++ b/mesalib/src/mesa/tnl/t_vb_cliptmp.h
@@ -1,320 +1,320 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.2

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

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

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

- *

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

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

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

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

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

- *

- * Authors:

- *    Keith Whitwell <keith@tungstengraphics.com>

- */

-

-

-#define CLIP_DOTPROD(K, A, B, C, D) X(K)*A + Y(K)*B + Z(K)*C + W(K)*D

-

-#define POLY_CLIP( PLANE_BIT, A, B, C, D )				\

-do {									\

-   if (mask & PLANE_BIT) {						\

-      GLuint idxPrev = inlist[0];					\

-      GLfloat dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );		\

-      GLuint outcount = 0;						\

-      GLuint i;								\

-									\

-      inlist[n] = inlist[0]; /* prevent rotation of vertices */		\

-      for (i = 1; i <= n; i++) {					\

-	 GLuint idx = inlist[i];					\

-	 GLfloat dp = CLIP_DOTPROD(idx, A, B, C, D );			\

-									\

-	 if (!IS_NEGATIVE(dpPrev)) {					\

-	    outlist[outcount++] = idxPrev;				\

-	 }								\

-									\

-	 if (DIFFERENT_SIGNS(dp, dpPrev)) {				\

-	    if (IS_NEGATIVE(dp)) {					\

-	       /* Going out of bounds.  Avoid division by zero as we	\

-		* know dp != dpPrev from DIFFERENT_SIGNS, above.	\

-		*/							\

-	       GLfloat t = dp / (dp - dpPrev);				\

-               INTERP_4F( t, coord[newvert], coord[idx], coord[idxPrev]); \

-      	       interp( ctx, t, newvert, idx, idxPrev, GL_TRUE );	\

-	    } else {							\

-	       /* Coming back in.					\

-		*/							\

-	       GLfloat t = dpPrev / (dpPrev - dp);			\

-               INTERP_4F( t, coord[newvert], coord[idxPrev], coord[idx]); \

-	       interp( ctx, t, newvert, idxPrev, idx, GL_FALSE );	\

-	    }								\

-            outlist[outcount++] = newvert++;				\

-	 }								\

-									\

-	 idxPrev = idx;							\

-	 dpPrev = dp;							\

-      }									\

-									\

-      if (outcount < 3)							\

-	 return;							\

-									\

-      {									\

-	 GLuint *tmp = inlist;						\

-	 inlist = outlist;						\

-	 outlist = tmp;							\

-	 n = outcount;							\

-      }									\

-   }									\

-} while (0)

-

-

-#define LINE_CLIP(PLANE_BIT, A, B, C, D )				\

-do {									\

-   if (mask & PLANE_BIT) {						\

-      const GLfloat dp0 = CLIP_DOTPROD( v0, A, B, C, D );		\

-      const GLfloat dp1 = CLIP_DOTPROD( v1, A, B, C, D );		\

-      const GLboolean neg_dp0 = IS_NEGATIVE(dp0);			\

-      const GLboolean neg_dp1 = IS_NEGATIVE(dp1);			\

-      									\

-      /* For regular clipping, we know from the clipmask that one	\

-       * (or both) of these must be negative (otherwise we wouldn't	\

-       * be here).							\

-       * For userclip, there is only a single bit for all active	\

-       * planes, so we can end up here when there is nothing to do,	\

-       * hence the second IS_NEGATIVE() test:				\

-       */								\

-      if (neg_dp0 && neg_dp1)						\

-         return; /* both vertices outside clip plane: discard */	\

-									\

-      if (neg_dp1) {							\

-	 GLfloat t = dp1 / (dp1 - dp0);					\

-	 if (t > t1) t1 = t;						\

-      } else if (neg_dp0) {						\

-	 GLfloat t = dp0 / (dp0 - dp1);					\

-	 if (t > t0) t0 = t;						\

-      }									\

-      if (t0 + t1 >= 1.0)						\

-	 return; /* discard */						\

-   }									\

-} while (0)

-

-

-

-/* Clip a line against the viewport and user clip planes.

- */

-static INLINE void

-TAG(clip_line)( struct gl_context *ctx, GLuint v0, GLuint v1, GLubyte mask )

-{

-   TNLcontext *tnl = TNL_CONTEXT(ctx);

-   struct vertex_buffer *VB = &tnl->vb;

-   tnl_interp_func interp = tnl->Driver.Render.Interp;

-   GLfloat (*coord)[4] = VB->ClipPtr->data;

-   GLuint newvert = VB->Count;

-   GLfloat t0 = 0;

-   GLfloat t1 = 0;

-   GLuint p;

-   const GLuint v0_orig = v0;

-

-   if (mask & CLIP_FRUSTUM_BITS) {

-      LINE_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );

-      LINE_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );

-      LINE_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );

-      LINE_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );

-      LINE_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );

-      LINE_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );

-   }

-

-   if (mask & CLIP_USER_BIT) {

-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

-	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

-            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

-            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

-            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

-            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

-	    LINE_CLIP( CLIP_USER_BIT, a, b, c, d );

-	 }

-      }

-   }

-

-   if (VB->ClipMask[v0]) {

-      INTERP_4F( t0, coord[newvert], coord[v0], coord[v1] );

-      interp( ctx, t0, newvert, v0, v1, GL_FALSE );

-      v0 = newvert;

-      newvert++;

-   }

-   else {

-      ASSERT(t0 == 0.0);

-   }

-

-   /* Note: we need to use vertex v0_orig when computing the new

-    * interpolated/clipped vertex position, not the current v0 which

-    * may have got set when we clipped the other end of the line!

-    */

-   if (VB->ClipMask[v1]) {

-      INTERP_4F( t1, coord[newvert], coord[v1], coord[v0_orig] );

-      interp( ctx, t1, newvert, v1, v0_orig, GL_FALSE );

-

-      if (ctx->Light.ShadeModel == GL_FLAT)

-	 tnl->Driver.Render.CopyPV( ctx, newvert, v1 );

-

-      v1 = newvert;

-

-      newvert++;

-   }

-   else {

-      ASSERT(t1 == 0.0);

-   }

-

-   tnl->Driver.Render.ClippedLine( ctx, v0, v1 );

-}

-

-

-/* Clip a triangle against the viewport and user clip planes.

- */

-static INLINE void

-TAG(clip_tri)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )

-{

-   TNLcontext *tnl = TNL_CONTEXT(ctx);

-   struct vertex_buffer *VB = &tnl->vb;

-   tnl_interp_func interp = tnl->Driver.Render.Interp;

-   GLuint newvert = VB->Count;

-   GLfloat (*coord)[4] = VB->ClipPtr->data;

-   GLuint pv = v2;

-   GLuint vlist[2][MAX_CLIPPED_VERTICES];

-   GLuint *inlist = vlist[0], *outlist = vlist[1];

-   GLuint p;

-   GLuint n = 3;

-

-   ASSIGN_3V(inlist, v2, v0, v1 ); /* pv rotated to slot zero */

-

-   if (0) {

-      /* print pre-clip vertex coords */

-      GLuint i, j;

-      printf("pre clip:\n");

-      for (i = 0; i < n; i++) {

-         j = inlist[i];

-         printf("  %u: %u: %f, %f, %f, %f\n",

-		i, j,

-		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);

-         assert(!IS_INF_OR_NAN(coord[j][0]));

-         assert(!IS_INF_OR_NAN(coord[j][1]));

-         assert(!IS_INF_OR_NAN(coord[j][2]));

-         assert(!IS_INF_OR_NAN(coord[j][3]));

-      }

-   }

-

-

-   if (mask & CLIP_FRUSTUM_BITS) {

-      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );

-      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );

-      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );

-      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );

-      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );

-      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );

-   }

-

-   if (mask & CLIP_USER_BIT) {

-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

-         if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

-            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

-            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

-            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

-            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

-            POLY_CLIP( CLIP_USER_BIT, a, b, c, d );

-         }

-      }

-   }

-

-   if (ctx->Light.ShadeModel == GL_FLAT) {

-      if (pv != inlist[0]) {

-	 ASSERT( inlist[0] >= VB->Count );

-	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );

-      }

-   }

-

-   if (0) {

-      /* print post-clip vertex coords */

-      GLuint i, j;

-      printf("post clip:\n");

-      for (i = 0; i < n; i++) {

-         j = inlist[i];

-         printf("  %u: %u: %f, %f, %f, %f\n",

-		i, j,

-		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);

-      }

-   }

-

-   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );

-}

-

-

-/* Clip a quad against the viewport and user clip planes.

- */

-static INLINE void

-TAG(clip_quad)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,

-                GLubyte mask )

-{

-   TNLcontext *tnl = TNL_CONTEXT(ctx);

-   struct vertex_buffer *VB = &tnl->vb;

-   tnl_interp_func interp = tnl->Driver.Render.Interp;

-   GLuint newvert = VB->Count;

-   GLfloat (*coord)[4] = VB->ClipPtr->data;

-   GLuint pv = v3;

-   GLuint vlist[2][MAX_CLIPPED_VERTICES];

-   GLuint *inlist = vlist[0], *outlist = vlist[1];

-   GLuint p;

-   GLuint n = 4;

-

-   ASSIGN_4V(inlist, v3, v0, v1, v2 ); /* pv rotated to slot zero */

-

-   if (mask & CLIP_FRUSTUM_BITS) {

-      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );

-      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );

-      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );

-      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );

-      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );

-      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );

-   }

-

-   if (mask & CLIP_USER_BIT) {

-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

-	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

-            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

-            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

-            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

-            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

-	    POLY_CLIP( CLIP_USER_BIT, a, b, c, d );

-	 }

-      }

-   }

-

-   if (ctx->Light.ShadeModel == GL_FLAT) {

-      if (pv != inlist[0]) {

-	 ASSERT( inlist[0] >= VB->Count );

-	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );

-      }

-   }

-

-   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );

-}

-

-#undef W

-#undef Z

-#undef Y

-#undef X

-#undef SIZE

-#undef TAG

-#undef POLY_CLIP

-#undef LINE_CLIP

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.2
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#define CLIP_DOTPROD(K, A, B, C, D) X(K)*A + Y(K)*B + Z(K)*C + W(K)*D
+
+#define POLY_CLIP( PLANE_BIT, A, B, C, D )				\
+do {									\
+   if (mask & PLANE_BIT) {						\
+      GLuint idxPrev = inlist[0];					\
+      GLfloat dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );		\
+      GLuint outcount = 0;						\
+      GLuint i;								\
+									\
+      inlist[n] = inlist[0]; /* prevent rotation of vertices */		\
+      for (i = 1; i <= n; i++) {					\
+	 GLuint idx = inlist[i];					\
+	 GLfloat dp = CLIP_DOTPROD(idx, A, B, C, D );			\
+									\
+	 if (!IS_NEGATIVE(dpPrev)) {					\
+	    outlist[outcount++] = idxPrev;				\
+	 }								\
+									\
+	 if (DIFFERENT_SIGNS(dp, dpPrev)) {				\
+	    if (IS_NEGATIVE(dp)) {					\
+	       /* Going out of bounds.  Avoid division by zero as we	\
+		* know dp != dpPrev from DIFFERENT_SIGNS, above.	\
+		*/							\
+	       GLfloat t = dp / (dp - dpPrev);				\
+               INTERP_4F( t, coord[newvert], coord[idx], coord[idxPrev]); \
+      	       interp( ctx, t, newvert, idx, idxPrev, GL_TRUE );	\
+	    } else {							\
+	       /* Coming back in.					\
+		*/							\
+	       GLfloat t = dpPrev / (dpPrev - dp);			\
+               INTERP_4F( t, coord[newvert], coord[idxPrev], coord[idx]); \
+	       interp( ctx, t, newvert, idxPrev, idx, GL_FALSE );	\
+	    }								\
+            outlist[outcount++] = newvert++;				\
+	 }								\
+									\
+	 idxPrev = idx;							\
+	 dpPrev = dp;							\
+      }									\
+									\
+      if (outcount < 3)							\
+	 return;							\
+									\
+      {									\
+	 GLuint *tmp = inlist;						\
+	 inlist = outlist;						\
+	 outlist = tmp;							\
+	 n = outcount;							\
+      }									\
+   }									\
+} while (0)
+
+
+#define LINE_CLIP(PLANE_BIT, A, B, C, D )				\
+do {									\
+   if (mask & PLANE_BIT) {						\
+      const GLfloat dp0 = CLIP_DOTPROD( v0, A, B, C, D );		\
+      const GLfloat dp1 = CLIP_DOTPROD( v1, A, B, C, D );		\
+      const GLboolean neg_dp0 = IS_NEGATIVE(dp0);			\
+      const GLboolean neg_dp1 = IS_NEGATIVE(dp1);			\
+      									\
+      /* For regular clipping, we know from the clipmask that one	\
+       * (or both) of these must be negative (otherwise we wouldn't	\
+       * be here).							\
+       * For userclip, there is only a single bit for all active	\
+       * planes, so we can end up here when there is nothing to do,	\
+       * hence the second IS_NEGATIVE() test:				\
+       */								\
+      if (neg_dp0 && neg_dp1)						\
+         return; /* both vertices outside clip plane: discard */	\
+									\
+      if (neg_dp1) {							\
+	 GLfloat t = dp1 / (dp1 - dp0);					\
+	 if (t > t1) t1 = t;						\
+      } else if (neg_dp0) {						\
+	 GLfloat t = dp0 / (dp0 - dp1);					\
+	 if (t > t0) t0 = t;						\
+      }									\
+      if (t0 + t1 >= 1.0)						\
+	 return; /* discard */						\
+   }									\
+} while (0)
+
+
+
+/* Clip a line against the viewport and user clip planes.
+ */
+static inline void
+TAG(clip_line)( struct gl_context *ctx, GLuint v0, GLuint v1, GLubyte mask )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   tnl_interp_func interp = tnl->Driver.Render.Interp;
+   GLfloat (*coord)[4] = VB->ClipPtr->data;
+   GLuint newvert = VB->Count;
+   GLfloat t0 = 0;
+   GLfloat t1 = 0;
+   GLuint p;
+   const GLuint v0_orig = v0;
+
+   if (mask & CLIP_FRUSTUM_BITS) {
+      LINE_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+      LINE_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+      LINE_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+      LINE_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+      LINE_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+      LINE_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+   }
+
+   if (mask & CLIP_USER_BIT) {
+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+	    LINE_CLIP( CLIP_USER_BIT, a, b, c, d );
+	 }
+      }
+   }
+
+   if (VB->ClipMask[v0]) {
+      INTERP_4F( t0, coord[newvert], coord[v0], coord[v1] );
+      interp( ctx, t0, newvert, v0, v1, GL_FALSE );
+      v0 = newvert;
+      newvert++;
+   }
+   else {
+      ASSERT(t0 == 0.0);
+   }
+
+   /* Note: we need to use vertex v0_orig when computing the new
+    * interpolated/clipped vertex position, not the current v0 which
+    * may have got set when we clipped the other end of the line!
+    */
+   if (VB->ClipMask[v1]) {
+      INTERP_4F( t1, coord[newvert], coord[v1], coord[v0_orig] );
+      interp( ctx, t1, newvert, v1, v0_orig, GL_FALSE );
+
+      if (ctx->Light.ShadeModel == GL_FLAT)
+	 tnl->Driver.Render.CopyPV( ctx, newvert, v1 );
+
+      v1 = newvert;
+
+      newvert++;
+   }
+   else {
+      ASSERT(t1 == 0.0);
+   }
+
+   tnl->Driver.Render.ClippedLine( ctx, v0, v1 );
+}
+
+
+/* Clip a triangle against the viewport and user clip planes.
+ */
+static inline void
+TAG(clip_tri)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   tnl_interp_func interp = tnl->Driver.Render.Interp;
+   GLuint newvert = VB->Count;
+   GLfloat (*coord)[4] = VB->ClipPtr->data;
+   GLuint pv = v2;
+   GLuint vlist[2][MAX_CLIPPED_VERTICES];
+   GLuint *inlist = vlist[0], *outlist = vlist[1];
+   GLuint p;
+   GLuint n = 3;
+
+   ASSIGN_3V(inlist, v2, v0, v1 ); /* pv rotated to slot zero */
+
+   if (0) {
+      /* print pre-clip vertex coords */
+      GLuint i, j;
+      printf("pre clip:\n");
+      for (i = 0; i < n; i++) {
+         j = inlist[i];
+         printf("  %u: %u: %f, %f, %f, %f\n",
+		i, j,
+		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
+         assert(!IS_INF_OR_NAN(coord[j][0]));
+         assert(!IS_INF_OR_NAN(coord[j][1]));
+         assert(!IS_INF_OR_NAN(coord[j][2]));
+         assert(!IS_INF_OR_NAN(coord[j][3]));
+      }
+   }
+
+
+   if (mask & CLIP_FRUSTUM_BITS) {
+      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+   }
+
+   if (mask & CLIP_USER_BIT) {
+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
+         if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+            POLY_CLIP( CLIP_USER_BIT, a, b, c, d );
+         }
+      }
+   }
+
+   if (ctx->Light.ShadeModel == GL_FLAT) {
+      if (pv != inlist[0]) {
+	 ASSERT( inlist[0] >= VB->Count );
+	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );
+      }
+   }
+
+   if (0) {
+      /* print post-clip vertex coords */
+      GLuint i, j;
+      printf("post clip:\n");
+      for (i = 0; i < n; i++) {
+         j = inlist[i];
+         printf("  %u: %u: %f, %f, %f, %f\n",
+		i, j,
+		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
+      }
+   }
+
+   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );
+}
+
+
+/* Clip a quad against the viewport and user clip planes.
+ */
+static inline void
+TAG(clip_quad)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,
+                GLubyte mask )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   tnl_interp_func interp = tnl->Driver.Render.Interp;
+   GLuint newvert = VB->Count;
+   GLfloat (*coord)[4] = VB->ClipPtr->data;
+   GLuint pv = v3;
+   GLuint vlist[2][MAX_CLIPPED_VERTICES];
+   GLuint *inlist = vlist[0], *outlist = vlist[1];
+   GLuint p;
+   GLuint n = 4;
+
+   ASSIGN_4V(inlist, v3, v0, v1, v2 ); /* pv rotated to slot zero */
+
+   if (mask & CLIP_FRUSTUM_BITS) {
+      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+   }
+
+   if (mask & CLIP_USER_BIT) {
+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+	    POLY_CLIP( CLIP_USER_BIT, a, b, c, d );
+	 }
+      }
+   }
+
+   if (ctx->Light.ShadeModel == GL_FLAT) {
+      if (pv != inlist[0]) {
+	 ASSERT( inlist[0] >= VB->Count );
+	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );
+      }
+   }
+
+   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );
+}
+
+#undef W
+#undef Z
+#undef Y
+#undef X
+#undef SIZE
+#undef TAG
+#undef POLY_CLIP
+#undef LINE_CLIP
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index 70551e0e1..4be016925 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -655,9 +655,6 @@ vbo_exec_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 	 CALL_End(GET_DISPATCH(), ());
       }
       break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
-      return;
    }
 }
 
diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index 0a63aa280..6fc1eafdd 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -148,9 +148,7 @@ SecurityLabelInitial(void)
 static _X_INLINE const char *
 SecurityLookupRequestName(ClientPtr client)
 {
-    int major = ((xReq *)client->requestBuffer)->reqType;
-    int minor = MinorOpcodeOfRequest(client);
-    return LookupRequestName(major, minor);
+    return LookupRequestName(client->majorOp, client->minorOp);
 }
 
 
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index 9c8beb27c..7ca027a90 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -481,7 +481,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
 {
     PixmapPtr pPixmap;
 
-    if (format == ZPixmap || depth == 1) {
+    if (format == ZPixmap || (format == XYPixmap && depth == 1)) {
 	pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
 					 BitsPerPixel(depth),
 					 PixmapBytePad(w, depth),
diff --git a/xorg-server/Xext/xselinux_hooks.c b/xorg-server/Xext/xselinux_hooks.c
index f1d8e5d2f..0d4c9ab11 100644
--- a/xorg-server/Xext/xselinux_hooks.c
+++ b/xorg-server/Xext/xselinux_hooks.c
@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata,
     if (client) {
 	REQUEST(xReq);
 	if (stuff) {
-	    major = stuff->reqType;
-	    minor = MinorOpcodeOfRequest(client);
+	    major = client->majorOp;
+	    minor = client->minorOp;
 	}
     }
     if (audit->id)
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 53db03629..20495e74d 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1628,6 +1628,19 @@ SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
     return Success;
 }
 
+static void
+FreeInputClient(InputClientsPtr *other)
+{
+    free(*other);
+    *other = NULL;
+}
+
+static InputClientsPtr
+AllocInputClient(void)
+{
+    return calloc(1, sizeof(InputClients));
+}
+
 int
 AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
 {
@@ -1635,7 +1648,7 @@ AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
 
     if (!pWin->optional && !MakeWindowOptional(pWin))
 	return BadAlloc;
-    others = calloc(1, sizeof(InputClients));
+    others = AllocInputClient();
     if (!others)
 	return BadAlloc;
     if (!pWin->optional->inputMasks && !MakeInputMasks(pWin))
@@ -1649,7 +1662,7 @@ AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
     return Success;
 
 bail:
-    free(others);
+    FreeInputClient(&others);
     return BadAlloc;
 }
 
@@ -1665,6 +1678,13 @@ MakeInputMasks(WindowPtr pWin)
     return TRUE;
 }
 
+static void
+FreeInputMask(OtherInputMasks **imask)
+{
+    free(*imask);
+    *imask = NULL;
+}
+
 void
 RecalculateDeviceDeliverableEvents(WindowPtr pWin)
 {
@@ -1721,14 +1741,15 @@ InputClientGone(WindowPtr pWin, XID id)
 	if (other->resource == id) {
 	    if (prev) {
 		prev->next = other->next;
-		free(other);
+		FreeInputClient(&other);
 	    } else if (!(other->next)) {
 		if (ShouldFreeInputMasks(pWin, TRUE)) {
-		    wOtherInputMasks(pWin)->inputClients = other->next;
-		    free(wOtherInputMasks(pWin));
+		    OtherInputMasks *mask = wOtherInputMasks(pWin);
+		    mask->inputClients = other->next;
+		    FreeInputMask(&mask);
 		    pWin->optional->inputMasks = (OtherInputMasks *) NULL;
 		    CheckWindowOptionalNeed(pWin);
-		    free(other);
+		    FreeInputClient(&other);
 		} else {
 		    other->resource = FakeClientID(0);
 		    if (!AddResource(other->resource, RT_INPUTCLIENT,
@@ -1737,7 +1758,7 @@ InputClientGone(WindowPtr pWin, XID id)
 		}
 	    } else {
 		wOtherInputMasks(pWin)->inputClients = other->next;
-		free(other);
+		FreeInputClient(&other);
 	    }
 	    RecalculateDeviceDeliverableEvents(pWin);
 	    return Success;
diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c
index 6be27f3d1..2f13a95e8 100644
--- a/xorg-server/Xi/xipassivegrab.c
+++ b/xorg-server/Xi/xipassivegrab.c
@@ -80,7 +80,6 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     DeviceIntPtr dev, mod_dev;
     xXIPassiveGrabDeviceReply rep;
     int i, ret = Success;
-    uint8_t status;
     uint32_t *modifiers;
     xXIGrabModifierInfo *modifiers_failed;
     GrabMask mask;
@@ -145,32 +144,36 @@ ProcXIPassiveGrabDevice(ClientPtr client)
 
     if (stuff->cursor != None)
     {
-        status = dixLookupResourceByType(&tmp, stuff->cursor,
-                                         RT_CURSOR, client, DixUseAccess);
-	if (status != Success)
-	{
-	    client->errorValue = stuff->cursor;
-	    return status;
-	}
+        ret = dixLookupResourceByType(&tmp, stuff->cursor,
+                                      RT_CURSOR, client, DixUseAccess);
+        if (ret != Success)
+        {
+            client->errorValue = stuff->cursor;
+            goto out;
+        }
     }
 
-    status = dixLookupWindow((WindowPtr*)&tmp, stuff->grab_window, client, DixSetAttrAccess);
-    if (status != Success)
-	return status;
+    ret = dixLookupWindow((WindowPtr*)&tmp, stuff->grab_window, client, DixSetAttrAccess);
+    if (ret != Success)
+        goto out;
 
-    status = CheckGrabValues(client, &param);
-    if (status != Success)
-        return status;
+    ret = CheckGrabValues(client, &param);
+    if (ret != Success)
+        goto out;
 
     modifiers = (uint32_t*)&stuff[1] + stuff->mask_len;
     modifiers_failed = calloc(stuff->num_modifiers, sizeof(xXIGrabModifierInfo));
-    if (!modifiers_failed)
-        return BadAlloc;
+    if (!modifiers_failed) {
+        ret = BadAlloc;
+        goto out;
+    }
 
     mod_dev = (IsFloating(dev)) ? dev : GetMaster(dev, MASTER_KEYBOARD);
 
     for (i = 0; i < stuff->num_modifiers; i++, modifiers++)
     {
+        uint8_t status = Success;
+
         param.modifiers = *modifiers;
         switch(stuff->grab_type)
         {
@@ -208,6 +211,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
         WriteToClient(client, rep.length * 4, (char*)modifiers_failed);
 
     free(modifiers_failed);
+out:
     return ret;
 }
 
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 6e3361573..b39271fd9 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -337,8 +337,6 @@ DisableLimitedSchedulingLatency(void)
 	SmartScheduleLatencyLimited = 0;
 }
 
-#define MAJOROP ((xReq *)client->requestBuffer)->reqType
-
 void
 Dispatch(void)
 {
@@ -419,21 +417,28 @@ Dispatch(void)
 	        }
 
 		client->sequence++;
+		client->majorOp = ((xReq *)client->requestBuffer)->reqType;
+		client->minorOp = 0;
+		if (client->majorOp >= EXTENSION_BASE) {
+		    ExtensionEntry *ext = GetExtensionEntry(client->majorOp);
+		    if (ext)
+			client->minorOp = ext->MinorOpcode(client);
+		}
 #ifdef XSERVER_DTRACE
-		XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP,
+		XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp,
 			      ((xReq *)client->requestBuffer)->length,
 			      client->index, client->requestBuffer);
 #endif
 		if (result > (maxBigRequestSize << 2))
 		    result = BadLength;
 		else {
-		    result = XaceHookDispatch(client, MAJOROP);
+		    result = XaceHookDispatch(client, client->majorOp);
 		    if (result == Success)
-			result = (* client->requestVector[MAJOROP])(client);
+			result = (* client->requestVector[client->majorOp])(client);
 		    XaceHookAuditEnd(client, result);
 		}
 #ifdef XSERVER_DTRACE
-		XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP,
+		XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp,
 			      client->sequence, client->index, result);
 #endif
 
@@ -444,8 +449,8 @@ Dispatch(void)
 		}
 		else if (result != Success)
 		{
-		    SendErrorToClient(client, MAJOROP,
-				      MinorOpcodeOfRequest(client),
+		    SendErrorToClient(client, client->majorOp,
+				      client->minorOp,
 				      client->errorValue, result);
 		    break;
 		}
@@ -466,8 +471,6 @@ Dispatch(void)
     SmartScheduleLatencyLimited = 0;
 }
 
-#undef MAJOROP
-
 static int  VendorRelease = VENDOR_RELEASE;
 static char *VendorString = VENDOR_NAME;
 
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 5e0dc5f17..4847db005 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -469,10 +469,11 @@ GetXI2MaskByte(unsigned char xi2mask[][XI2MASKSIZE], DeviceIntPtr dev, int event
 
 
 /**
- * Return the windows complete XI2 mask for the given XI2 event type.
+ * @return TRUE if the mask is set for this event from this device on the
+ * window, or FALSE otherwise.
  */
-Mask
-GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
+Bool
+WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
 {
     OtherInputMasks *inputMasks = wOtherInputMasks(win);
     int filter;
@@ -484,7 +485,7 @@ GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
     evtype = ((xGenericEvent*)ev)->evtype;
     filter = GetEventFilter(dev, ev);
 
-    return (GetXI2MaskByte(inputMasks->xi2mask, dev, evtype) & filter);
+    return !!(GetXI2MaskByte(inputMasks->xi2mask, dev, evtype) & filter);
 }
 
 Mask
@@ -2075,7 +2076,7 @@ GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win,
     {
         OtherInputMasks *inputMasks = wOtherInputMasks(win);
         /* Has any client selected for the event? */
-        if (!GetWindowXI2Mask(dev, win, events))
+        if (!WindowXI2MaskIsset(dev, win, events))
             goto out;
         *clients = inputMasks->inputClients;
     } else {
@@ -3787,14 +3788,13 @@ CheckPassiveGrabsOnWindow(
         }
 
         if (!activate)
-        {
-            return grab;
-        }
+            break;
         else if (!GetXIType(event) && !GetCoreType(event))
         {
             ErrorF("Event type %d in CheckPassiveGrabsOnWindow is neither"
                    " XI 1.x nor core\n", event->any.type);
-            return NULL;
+            grab = NULL;
+            break;
         }
 
         /* The only consumers of corestate are Xi 1.x and core events, which
@@ -3860,9 +3860,10 @@ CheckPassiveGrabsOnWindow(
         }
 
         free(xE);
-        return grab;
+        break;
     }
-    return NULL;
+
+    return grab;
 #undef CORE_MATCH
 #undef XI_MATCH
 #undef XI2_MATCH
@@ -4632,7 +4633,7 @@ DeviceEnterLeaveEvent(
         TryClientEvents(rClient(grab), mouse, (xEvent*)event, 1, mask,
                         filter, grab);
     } else {
-        if (!GetWindowXI2Mask(mouse, pWin, (xEvent*)event))
+        if (!WindowXI2MaskIsset(mouse, pWin, (xEvent*)event))
             goto out;
         DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter,
                               NullGrab);
diff --git a/xorg-server/dix/extension.c b/xorg-server/dix/extension.c
index 53aaf051f..cc516b6ba 100644
--- a/xorg-server/dix/extension.c
+++ b/xorg-server/dix/extension.c
@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client)
     return ((xReq *)client->requestBuffer)->data;
 }
 
-unsigned short
-MinorOpcodeOfRequest(ClientPtr client)
-{
-    unsigned char major;
-
-    major = ((xReq *)client->requestBuffer)->reqType;
-    if (major < EXTENSION_BASE)
-	return 0;
-    major -= EXTENSION_BASE;
-    if (major >= NumExtensions)
-	return 0;
-    return (*extensions[major]->MinorOpcode)(client);
-}
-
 void
 CloseDownExtensions(void)
 {
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
index d7b4d3c20..2019741b2 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
@@ -98,8 +98,6 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
 {
 	if (fbdevHWPrivateIndex < 0)
 		return;
-	if (FBDEVHWPTR(pScrn) == NULL)
-		return;
 	free(FBDEVHWPTR(pScrn));
 	FBDEVHWPTRLVAL(pScrn) = NULL;
 }
diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index 6cc961478..0a85f40b6 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -122,6 +122,7 @@ typedef struct _Client {
     
     DeviceIntPtr clientPtr;
     ClientIdPtr  clientIds;
+    unsigned short majorOp, minorOp;
 }           ClientRec;
 
 /*
diff --git a/xorg-server/include/extension.h b/xorg-server/include/extension.h
index ee6260eb5..17accafd9 100644
--- a/xorg-server/include/extension.h
+++ b/xorg-server/include/extension.h
@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN
 
 extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
 
-extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
-
 extern _X_EXPORT Bool EnableDisableExtension(const char *name, Bool enable);
 
 extern _X_EXPORT void EnableDisableExtensionError(const char *name, Bool enable);
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 87bb2aa01..8e7b47a4c 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -535,7 +535,7 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
 /* misc event helpers */
 extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);
 extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
-extern Mask GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
+extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
 void FixUpEventFromWindow(SpritePtr pSprite,
                           xEvent *xE,
                           WindowPtr pWin,
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index 0a2128732..f482a2294 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -72,7 +72,7 @@ extern _X_EXPORT int CountBits(const uint8_t *mask, int len);
  * this number here is bumped.
  */
 #define XI2LASTEVENT    17 /* XI_RawMotion */
-#define XI2MASKSIZE     ((XI2LASTEVENT + 7)/8) /* no of bits for masks */
+#define XI2MASKSIZE     ((XI2LASTEVENT >> 3) + 1) /* no of bytes for masks */
 
 /**
  * Scroll types for ::SetScrollValuator and the scroll type in the
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 2e8dd1b89..ef86fa539 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -359,4 +359,11 @@ typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */
 extern _X_EXPORT unsigned long globalSerialNumber;
 extern _X_EXPORT unsigned long serverGeneration;
 
+#define BUG_WARN(cond)                                                    \
+          do { if (cond) {                                                \
+              ErrorF("BUG: triggered 'if (" #cond ")'\nBUG: %s:%d in %s()\n",     \
+                      __FILE__, __LINE__, __func__);                      \
+              xorg_backtrace();                                           \
+          } } while(0)
+
 #endif /* MISC_H */
diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c
index db77b64f5..b956b4ab8 100644
--- a/xorg-server/record/record.c
+++ b/xorg-server/record/record.c
@@ -552,7 +552,7 @@ RecordARequest(ClientPtr client)
 	    }
 	    else /* extension, check minor opcode */
 	    {
-		int minorop = MinorOpcodeOfRequest(client);
+		int minorop = client->minorOp;
 		int numMinOpInfo;
 		RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo;
 
@@ -609,12 +609,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
     RecordContextPtr pContext;
     RecordClientsAndProtocolPtr pRCAP;
     int eci;
-    int majorop;
     ReplyInfoRec *pri = (ReplyInfoRec *)calldata;
     ClientPtr client = pri->client;
-    REQUEST(xReq);
 
-    majorop = stuff->reqType;
     for (eci = 0; eci < numEnabledContexts; eci++)
     {
 	pContext = ppAllContexts[eci];
@@ -622,6 +619,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
 					  NULL);
 	if (pRCAP)
 	{
+	    int majorop = client->majorOp;
 	    if (pContext->continuedReply)
 	    {
 		RecordAProtocolElement(pContext, client, XRecordFromServer,
@@ -642,7 +640,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
 		}
 		else /* extension, check minor opcode */
 		{
-		    int minorop = MinorOpcodeOfRequest(client);
+		    int minorop = client->minorOp;
 		    int numMinOpInfo;
 		    RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo;
 		    		    assert (pMinorOpInfo);
diff --git a/xorg-server/test/misc.c b/xorg-server/test/misc.c
index d98449ba0..1f6cb9a94 100644
--- a/xorg-server/test/misc.c
+++ b/xorg-server/test/misc.c
@@ -76,7 +76,6 @@ static void dix_update_desktop_dimensions(void)
 
 #define assert_dimensions(_x, _y, _w, _h) \
     update_desktop_dimensions();          \
-    printf("%d %d %d %d\n", screenInfo.x, screenInfo.y, screenInfo.width, screenInfo.height); \
     assert(screenInfo.x == _x);           \
     assert(screenInfo.y == _y);           \
     assert(screenInfo.width == _w);       \
@@ -88,8 +87,6 @@ static void dix_update_desktop_dimensions(void)
     screenInfo.screens[idx]->width = _w;  \
     screenInfo.screens[idx]->height = _h; \
 
-    printf("Testing\n");
-
     /* single screen */
     screenInfo.numScreens = 1;
     set_screen(0, x, y, w, h);
diff --git a/xorg-server/xkeyboard-config/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am
index 943539fc6..fe8f08c84 100644
--- a/xorg-server/xkeyboard-config/Makefile.am
+++ b/xorg-server/xkeyboard-config/Makefile.am
@@ -8,8 +8,6 @@ pkgconfig_DATA = xkeyboard-config.pc
 EXTRA_DIST=config.rpath COPYING CREDITS README \
        autogen.sh \
        xkeyboard-config.pc.in \
-       xkeyboard-config.spec \
-       xkeyboard-config.spec.in \
        intltool-extract.in intltool-merge.in intltool-update.in
 
 DISTCLEANFILES=intltool-extract intltool-merge intltool-update
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index fa4baef95..82b1e1d4f 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -111,7 +111,6 @@ symbols/sun_vndr/Makefile
 symbols/xfree68_vndr/Makefile
 types/Makefile
 xkeyboard-config.pc
-xkeyboard-config.spec
 docs/Makefile
 man/Makefile
 ])
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 8816034a3..47d160e30 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4779,7 +4779,6 @@
         <_description>Taiwanese</_description>
         <languageList>
           <iso639Id>trv</iso639Id>
-          <iso639Id>pwn</iso639Id>
         </languageList>
       </configItem>
       <variantList>
diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd
index 938bf2b69..78803dbcc 100644
--- a/xorg-server/xkeyboard-config/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd
@@ -30,7 +30,7 @@ xkb_symbols "basic" {
     key <AD04> { [         r,          R                                  ] };
     key <AD05> { [	   t,          T                                  ] };
     key <AD06> { [	   y,          Y                                  ] };
-    key <AD07> { [	   u,          U,    0x01000289,       0x01001d7e ] };
+    key <AD07> { [	   u,          U,    0x01000289,       0x01000244 ] };
     key <AD08> { [	   i,          I,    0x01000268,       0x01000197 ] };
     key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
     key <AD10> { [	   p,          P                                  ] };
diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is
index c40b8a965..f8e0ce133 100644
--- a/xorg-server/xkeyboard-config/symbols/is
+++ b/xorg-server/xkeyboard-config/symbols/is
@@ -2,6 +2,10 @@
 // XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
 //     fixes by Olafur Osvaldsson - oli@isnic.is
 //
+// "basic" corrected according to the Icelandic standard for keyboards,
+//     IST 125:1995 (some symbols substituted by a dead diacritic).
+//     Some positions are according to IST ISO/IEC 9995-3:1994
+//     Added nobreakspace
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
@@ -10,21 +14,27 @@ xkb_symbols "basic" {
 
     name[Group1]="Icelandic";
 
+//  <AE00> = <TLDE>
     key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
     key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
     key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};
-    key <AE12>	{ [     minus, underscore,     ccedilla,  dead_ogonek ]	};
+    key <AE12>	{ [     minus, underscore, dead_cedilla,  dead_ogonek ]	};
 
     key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
+    key <AD12>	{ [apostrophe,   question,   dead_tilde,  dead_macron ]	};
 
     key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
-    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };
-    key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
+    key <AC11>	{ [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
+    key <TLDE>	{ [dead_abovering,  dead_diaeresis,      notsign,      hyphen ]	};
 
-    key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};
+//  <AC12> = <BKSL>
+    key <BKSL>	{ [      plus,   asterisk,   dead_grave,   dead_breve ]	};
+
+//  <AB00> = <LSGT>, is in file "pc": pc105
     key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
 
+    key <SPCE>  { [     space,      space,  nobreakspace, nobreakspace ] };
+
     include "level3(ralt_switch)"
 };
 
diff --git a/xorg-server/xkeyboard-config/xkeyboard-config.spec.in b/xorg-server/xkeyboard-config/xkeyboard-config.spec.in
deleted file mode 100644
index 0b2082af7..000000000
--- a/xorg-server/xkeyboard-config/xkeyboard-config.spec.in
+++ /dev/null
@@ -1,45 +0,0 @@
-Name:		xkeyboard-config
-Summary:	XML-based XKB configuration registry
-Version:	@VERSION@
-Release:	1
-License:	X11/MIT
-Group:		User Interface/X
-
-Url: http://gswitchit.sourceforge.net/
-
-Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildArch:      noarch
-
-%description
-Just XML stuff. Later hopefully will be part of XFree86
-
-%prep
-%setup -q
-
-%build
-
-if [ ! -f configure ]; then
-    CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh
-fi
-
-CFLAGS="$RPM_OPT_FLAGS" ./configure 
-
-make 
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{_prefix} install 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale
-
-%clean
-rm -rf %{buildroot}
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
-%files
-%defattr(-, root, root)
-
-%doc AUTHORS CREDITS ChangeLog NEWS README COPYING docs/README.config docs/README.enhancing docs/README.symbols docs/HOWTO.transition docs/HOWTO.testing
-%{_prefix}/lib/X11/xkb/*